From d29a888bf2dfd87f065013145a4853901542b4a4 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Fri, 22 Nov 2024 11:41:08 -0800 Subject: [PATCH] Replace `\r\n` code with Dart SDK standard conventions. (#159346) Also deleted a file that appeared to be unused. --- .../bin/tasks/build_aar_module_test.dart | 14 ++++++-------- ...build_android_host_app_with_module_aar.dart | 13 ++++++------- ...ld_android_host_app_with_module_source.dart | 13 ++++++------- .../tasks/gradle_plugin_light_apk_test.dart | 2 +- .../module_custom_host_app_name_test.dart | 9 ++++----- .../bin/tasks/plugin_dependencies_test.dart | 18 ++++++++---------- dev/devicelab/lib/framework/apk_utils.dart | 8 +++----- .../new_gallery/test/utils.dart | 6 ------ 8 files changed, 34 insertions(+), 49 deletions(-) delete mode 100644 dev/integration_tests/new_gallery/test/utils.dart diff --git a/dev/devicelab/bin/tasks/build_aar_module_test.dart b/dev/devicelab/bin/tasks/build_aar_module_test.dart index c30639830d6..6232d25a9e5 100644 --- a/dev/devicelab/bin/tasks/build_aar_module_test.dart +++ b/dev/devicelab/bin/tasks/build_aar_module_test.dart @@ -10,8 +10,6 @@ import 'package:flutter_devicelab/framework/task_result.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:path/path.dart' as path; -final String platformLineSep = Platform.isWindows ? '\r\n': '\n'; - /// Tests that AARs can be built on module projects. Future main() async { await task(() async { @@ -59,12 +57,12 @@ Future main() async { final File modulePubspec = File(path.join(projectDir.path, 'pubspec.yaml')); String content = modulePubspec.readAsStringSync(); content = content.replaceFirst( - '${platformLineSep}dependencies:$platformLineSep', - '${platformLineSep}dependencies:$platformLineSep' - ' plugin_with_android:$platformLineSep' - ' path: ../plugin_with_android$platformLineSep' - ' plugin_without_android:$platformLineSep' - ' path: ../plugin_without_android$platformLineSep' + '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}', + '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}' + ' plugin_with_android:${Platform.lineTerminator}' + ' path: ../plugin_with_android${Platform.lineTerminator}' + ' plugin_without_android:${Platform.lineTerminator}' + ' path: ../plugin_without_android${Platform.lineTerminator}' ); modulePubspec.writeAsStringSync(content, flush: true); diff --git a/dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart b/dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart index 0b1f16820fb..3f5457b7d58 100644 --- a/dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart +++ b/dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart @@ -17,7 +17,6 @@ final String gradlew = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; final String gradlewExecutable = Platform.isWindows ? '.\\$gradlew' : './$gradlew'; final String fileReadWriteMode = Platform.isWindows ? 'rw-rw-rw-' : 'rw-r--r--'; -final String platformLineSep = Platform.isWindows ? '\r\n' : '\n'; /// Combines several TaskFunctions with trivial success value into one. TaskFunction combine(List tasks) { @@ -79,8 +78,8 @@ class ModuleTest { final File pubspec = File(path.join(projectDir.path, 'pubspec.yaml')); String content = await pubspec.readAsString(); content = content.replaceFirst( - 'dependencies:$platformLineSep', - 'dependencies:$platformLineSep $ffiPackageName:$platformLineSep path: ..${Platform.pathSeparator}$ffiPackageName$platformLineSep', + 'dependencies:${Platform.lineTerminator}', + 'dependencies:${Platform.lineTerminator} $ffiPackageName:${Platform.lineTerminator} path: ..${Platform.pathSeparator}$ffiPackageName${Platform.lineTerminator}', ); await pubspec.writeAsString(content, flush: true); await inDirectory(projectDir, () async { @@ -111,16 +110,16 @@ class ModuleTest { } content = content.replaceFirst( - '$platformLineSep # assets:$platformLineSep', - '$platformLineSep assets:$platformLineSep - assets/read-only.txt$platformLineSep', + '${Platform.lineTerminator} # assets:${Platform.lineTerminator}', + '${Platform.lineTerminator} assets:${Platform.lineTerminator} - assets/read-only.txt${Platform.lineTerminator}', ); await pubspec.writeAsString(content, flush: true); section('Add plugins'); content = content.replaceFirst( - '${platformLineSep}dependencies:$platformLineSep', - '${platformLineSep}dependencies:$platformLineSep', + '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}', + '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}', ); await pubspec.writeAsString(content, flush: true); await inDirectory(projectDir, () async { diff --git a/dev/devicelab/bin/tasks/build_android_host_app_with_module_source.dart b/dev/devicelab/bin/tasks/build_android_host_app_with_module_source.dart index 542ba31f8cc..6eb381ce359 100644 --- a/dev/devicelab/bin/tasks/build_android_host_app_with_module_source.dart +++ b/dev/devicelab/bin/tasks/build_android_host_app_with_module_source.dart @@ -17,7 +17,6 @@ final String gradlew = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; final String gradlewExecutable = Platform.isWindows ? '.\\$gradlew' : './$gradlew'; final String fileReadWriteMode = Platform.isWindows ? 'rw-rw-rw-' : 'rw-r--r--'; -final String platformLineSep = Platform.isWindows ? '\r\n' : '\n'; /// Combines several TaskFunctions with trivial success value into one. TaskFunction combine(List tasks) { @@ -79,8 +78,8 @@ class ModuleTest { final File pubspec = File(path.join(projectDir.path, 'pubspec.yaml')); String content = await pubspec.readAsString(); content = content.replaceFirst( - 'dependencies:$platformLineSep', - 'dependencies:$platformLineSep $ffiPackageName:$platformLineSep path: ..${Platform.pathSeparator}$ffiPackageName$platformLineSep', + 'dependencies:${Platform.lineTerminator}', + 'dependencies:${Platform.lineTerminator} $ffiPackageName:${Platform.lineTerminator} path: ..${Platform.pathSeparator}$ffiPackageName${Platform.lineTerminator}', ); await pubspec.writeAsString(content, flush: true); await inDirectory(projectDir, () async { @@ -111,16 +110,16 @@ class ModuleTest { } content = content.replaceFirst( - '$platformLineSep # assets:$platformLineSep', - '$platformLineSep assets:$platformLineSep - assets/read-only.txt$platformLineSep', + '${Platform.lineTerminator} # assets:${Platform.lineTerminator}', + '${Platform.lineTerminator} assets:${Platform.lineTerminator} - assets/read-only.txt${Platform.lineTerminator}', ); await pubspec.writeAsString(content, flush: true); section('Add plugins'); content = content.replaceFirst( - '${platformLineSep}dependencies:$platformLineSep', - '${platformLineSep}dependencies:$platformLineSep', + '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}', + '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}', ); await pubspec.writeAsString(content, flush: true); await inDirectory(projectDir, () async { diff --git a/dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart b/dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart index ee3519a39eb..332e8ac4315 100644 --- a/dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart +++ b/dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart @@ -211,7 +211,7 @@ Future main() async { section('Configure'); project.addPlugin('plugin_under_test', - value: '$platformLineSep path: ${pluginDir.path}'); + value: '${Platform.lineTerminator} path: ${pluginDir.path}'); await project.addCustomBuildType('local', initWith: 'debug'); await project.getPackages(); diff --git a/dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart b/dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart index 9cb5a637875..d5aa93f5120 100644 --- a/dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart +++ b/dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart @@ -13,7 +13,6 @@ import 'package:path/path.dart' as path; final String gradlew = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; final String gradlewExecutable = Platform.isWindows ? '.\\$gradlew' : './$gradlew'; final String fileReadWriteMode = Platform.isWindows ? 'rw-rw-rw-' : 'rw-r--r--'; -final String platformLineSep = Platform.isWindows ? '\r\n': '\n'; /// Tests that the Flutter module project template works and supports /// adding Flutter to an existing Android app. @@ -63,8 +62,8 @@ Future main() async { final File pubspec = File(path.join(projectDir.path, 'pubspec.yaml')); String content = await pubspec.readAsString(); content = content.replaceFirst( - '$platformLineSep # assets:$platformLineSep', - '$platformLineSep assets:$platformLineSep - assets/read-only.txt$platformLineSep', + '${Platform.lineTerminator} # assets:${Platform.lineTerminator}', + '${Platform.lineTerminator} assets:${Platform.lineTerminator} - assets/read-only.txt${Platform.lineTerminator}', ); await pubspec.writeAsString(content, flush: true); @@ -72,8 +71,8 @@ Future main() async { content = await pubspec.readAsString(); content = content.replaceFirst( - '${platformLineSep}dependencies:$platformLineSep', - '${platformLineSep}dependencies:$platformLineSep', + '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}', + '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}', ); await pubspec.writeAsString(content, flush: true); await inDirectory(projectDir, () async { diff --git a/dev/devicelab/bin/tasks/plugin_dependencies_test.dart b/dev/devicelab/bin/tasks/plugin_dependencies_test.dart index e0f6178c9f0..54f9979dbc3 100644 --- a/dev/devicelab/bin/tasks/plugin_dependencies_test.dart +++ b/dev/devicelab/bin/tasks/plugin_dependencies_test.dart @@ -11,8 +11,6 @@ import 'package:flutter_devicelab/framework/task_result.dart'; import 'package:flutter_devicelab/framework/utils.dart'; import 'package:path/path.dart' as path; -final String platformLineSep = Platform.isWindows ? '\r\n': '\n'; - /// Tests that a plugin A can depend on platform code from a plugin B /// as long as plugin B is defined as a pub dependency of plugin A. /// @@ -154,14 +152,14 @@ public class DummyPluginBClass { final File pluginApubspec = File(path.join(pluginADirectory.path, 'pubspec.yaml')); String pluginApubspecContent = await pluginApubspec.readAsString(); pluginApubspecContent = pluginApubspecContent.replaceFirst( - '${platformLineSep}dependencies:$platformLineSep', - '${platformLineSep}dependencies:$platformLineSep' - ' plugin_b:$platformLineSep' - ' path: ${pluginBDirectory.path}$platformLineSep' - ' plugin_c:$platformLineSep' - ' path: ${pluginCDirectory.path}$platformLineSep' - ' plugin_d:$platformLineSep' - ' path: ${pluginDDirectory.path}$platformLineSep', + '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}', + '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}' + ' plugin_b:${Platform.lineTerminator}' + ' path: ${pluginBDirectory.path}${Platform.lineTerminator}' + ' plugin_c:${Platform.lineTerminator}' + ' path: ${pluginCDirectory.path}${Platform.lineTerminator}' + ' plugin_d:${Platform.lineTerminator}' + ' path: ${pluginDDirectory.path}${Platform.lineTerminator}', ); await pluginApubspec.writeAsString(pluginApubspecContent, flush: true); diff --git a/dev/devicelab/lib/framework/apk_utils.dart b/dev/devicelab/lib/framework/apk_utils.dart index e9ebfea319c..d0ce8ee289c 100644 --- a/dev/devicelab/lib/framework/apk_utils.dart +++ b/dev/devicelab/lib/framework/apk_utils.dart @@ -9,8 +9,6 @@ import 'package:path/path.dart' as path; import 'task_result.dart'; import 'utils.dart'; -final String platformLineSep = Platform.isWindows ? '\r\n' : '\n'; - final List flutterAssets = [ 'assets/flutter_assets/AssetManifest.json', 'assets/flutter_assets/NOTICES.Z', @@ -280,8 +278,8 @@ android { final File pubspec = File(path.join(rootPath, 'pubspec.yaml')); String content = pubspec.readAsStringSync(); content = content.replaceFirst( - '${platformLineSep}dependencies:$platformLineSep', - '${platformLineSep}dependencies:$platformLineSep $plugin: $value$platformLineSep', + '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}', + '${Platform.lineTerminator}dependencies:${Platform.lineTerminator} $plugin: $value${Platform.lineTerminator}', ); pubspec.writeAsStringSync(content, flush: true); } @@ -336,7 +334,7 @@ android { path.join(parent.path, 'hello', 'pubspec.yaml') ); final String contents = pubspec.readAsStringSync(); - final String newContents = contents.replaceFirst('${platformLineSep}flutter:$platformLineSep', ''' + final String newContents = contents.replaceFirst('${Platform.lineTerminator}flutter:${Platform.lineTerminator}', ''' flutter: assets: diff --git a/dev/integration_tests/new_gallery/test/utils.dart b/dev/integration_tests/new_gallery/test/utils.dart deleted file mode 100644 index 9218e2ee8d7..00000000000 --- a/dev/integration_tests/new_gallery/test/utils.dart +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2014 The Flutter Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Replace Windows line endings with Unix line endings -String standardizeLineEndings(String str) => str.replaceAll('\r\n', '\n');