Skip to content

Commit d29a888

Browse files
matanlureymatanlurey
authored
Replace \r\n code with Dart SDK standard conventions. (#159346)
Also deleted a file that appeared to be unused.
1 parent b310baf commit d29a888

8 files changed

Lines changed: 34 additions & 49 deletions

‎dev/devicelab/bin/tasks/build_aar_module_test.dart‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ import 'package:flutter_devicelab/framework/task_result.dart';
1010
import 'package:flutter_devicelab/framework/utils.dart';
1111
import 'package:path/path.dart' as path;
1212

13-
final String platformLineSep = Platform.isWindows ? '\r\n': '\n';
14-
1513
/// Tests that AARs can be built on module projects.
1614
Future<void> main() async {
1715
await task(() async {
@@ -59,12 +57,12 @@ Future<void> main() async {
5957
final File modulePubspec = File(path.join(projectDir.path, 'pubspec.yaml'));
6058
String content = modulePubspec.readAsStringSync();
6159
content = content.replaceFirst(
62-
'${platformLineSep}dependencies:$platformLineSep',
63-
'${platformLineSep}dependencies:$platformLineSep'
64-
' plugin_with_android:$platformLineSep'
65-
' path: ../plugin_with_android$platformLineSep'
66-
' plugin_without_android:$platformLineSep'
67-
' path: ../plugin_without_android$platformLineSep'
60+
'${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
61+
'${Platform.lineTerminator}dependencies:${Platform.lineTerminator}'
62+
' plugin_with_android:${Platform.lineTerminator}'
63+
' path: ../plugin_with_android${Platform.lineTerminator}'
64+
' plugin_without_android:${Platform.lineTerminator}'
65+
' path: ../plugin_without_android${Platform.lineTerminator}'
6866
);
6967
modulePubspec.writeAsStringSync(content, flush: true);
7068

‎dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ final String gradlew = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
1717
final String gradlewExecutable =
1818
Platform.isWindows ? '.\\$gradlew' : './$gradlew';
1919
final String fileReadWriteMode = Platform.isWindows ? 'rw-rw-rw-' : 'rw-r--r--';
20-
final String platformLineSep = Platform.isWindows ? '\r\n' : '\n';
2120

2221
/// Combines several TaskFunctions with trivial success value into one.
2322
TaskFunction combine(List<TaskFunction> tasks) {
@@ -79,8 +78,8 @@ class ModuleTest {
7978
final File pubspec = File(path.join(projectDir.path, 'pubspec.yaml'));
8079
String content = await pubspec.readAsString();
8180
content = content.replaceFirst(
82-
'dependencies:$platformLineSep',
83-
'dependencies:$platformLineSep $ffiPackageName:$platformLineSep path: ..${Platform.pathSeparator}$ffiPackageName$platformLineSep',
81+
'dependencies:${Platform.lineTerminator}',
82+
'dependencies:${Platform.lineTerminator} $ffiPackageName:${Platform.lineTerminator} path: ..${Platform.pathSeparator}$ffiPackageName${Platform.lineTerminator}',
8483
);
8584
await pubspec.writeAsString(content, flush: true);
8685
await inDirectory(projectDir, () async {
@@ -111,16 +110,16 @@ class ModuleTest {
111110
}
112111

113112
content = content.replaceFirst(
114-
'$platformLineSep # assets:$platformLineSep',
115-
'$platformLineSep assets:$platformLineSep - assets/read-only.txt$platformLineSep',
113+
'${Platform.lineTerminator} # assets:${Platform.lineTerminator}',
114+
'${Platform.lineTerminator} assets:${Platform.lineTerminator} - assets/read-only.txt${Platform.lineTerminator}',
116115
);
117116
await pubspec.writeAsString(content, flush: true);
118117

119118
section('Add plugins');
120119

121120
content = content.replaceFirst(
122-
'${platformLineSep}dependencies:$platformLineSep',
123-
'${platformLineSep}dependencies:$platformLineSep',
121+
'${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
122+
'${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
124123
);
125124
await pubspec.writeAsString(content, flush: true);
126125
await inDirectory(projectDir, () async {

‎dev/devicelab/bin/tasks/build_android_host_app_with_module_source.dart‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ final String gradlew = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
1717
final String gradlewExecutable =
1818
Platform.isWindows ? '.\\$gradlew' : './$gradlew';
1919
final String fileReadWriteMode = Platform.isWindows ? 'rw-rw-rw-' : 'rw-r--r--';
20-
final String platformLineSep = Platform.isWindows ? '\r\n' : '\n';
2120

2221
/// Combines several TaskFunctions with trivial success value into one.
2322
TaskFunction combine(List<TaskFunction> tasks) {
@@ -79,8 +78,8 @@ class ModuleTest {
7978
final File pubspec = File(path.join(projectDir.path, 'pubspec.yaml'));
8079
String content = await pubspec.readAsString();
8180
content = content.replaceFirst(
82-
'dependencies:$platformLineSep',
83-
'dependencies:$platformLineSep $ffiPackageName:$platformLineSep path: ..${Platform.pathSeparator}$ffiPackageName$platformLineSep',
81+
'dependencies:${Platform.lineTerminator}',
82+
'dependencies:${Platform.lineTerminator} $ffiPackageName:${Platform.lineTerminator} path: ..${Platform.pathSeparator}$ffiPackageName${Platform.lineTerminator}',
8483
);
8584
await pubspec.writeAsString(content, flush: true);
8685
await inDirectory(projectDir, () async {
@@ -111,16 +110,16 @@ class ModuleTest {
111110
}
112111

113112
content = content.replaceFirst(
114-
'$platformLineSep # assets:$platformLineSep',
115-
'$platformLineSep assets:$platformLineSep - assets/read-only.txt$platformLineSep',
113+
'${Platform.lineTerminator} # assets:${Platform.lineTerminator}',
114+
'${Platform.lineTerminator} assets:${Platform.lineTerminator} - assets/read-only.txt${Platform.lineTerminator}',
116115
);
117116
await pubspec.writeAsString(content, flush: true);
118117

119118
section('Add plugins');
120119

121120
content = content.replaceFirst(
122-
'${platformLineSep}dependencies:$platformLineSep',
123-
'${platformLineSep}dependencies:$platformLineSep',
121+
'${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
122+
'${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
124123
);
125124
await pubspec.writeAsString(content, flush: true);
126125
await inDirectory(projectDir, () async {

‎dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ Future<void> main() async {
211211

212212
section('Configure');
213213
project.addPlugin('plugin_under_test',
214-
value: '$platformLineSep path: ${pluginDir.path}');
214+
value: '${Platform.lineTerminator} path: ${pluginDir.path}');
215215
await project.addCustomBuildType('local', initWith: 'debug');
216216
await project.getPackages();
217217

‎dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import 'package:path/path.dart' as path;
1313
final String gradlew = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
1414
final String gradlewExecutable = Platform.isWindows ? '.\\$gradlew' : './$gradlew';
1515
final String fileReadWriteMode = Platform.isWindows ? 'rw-rw-rw-' : 'rw-r--r--';
16-
final String platformLineSep = Platform.isWindows ? '\r\n': '\n';
1716

1817
/// Tests that the Flutter module project template works and supports
1918
/// adding Flutter to an existing Android app.
@@ -63,17 +62,17 @@ Future<void> main() async {
6362
final File pubspec = File(path.join(projectDir.path, 'pubspec.yaml'));
6463
String content = await pubspec.readAsString();
6564
content = content.replaceFirst(
66-
'$platformLineSep # assets:$platformLineSep',
67-
'$platformLineSep assets:$platformLineSep - assets/read-only.txt$platformLineSep',
65+
'${Platform.lineTerminator} # assets:${Platform.lineTerminator}',
66+
'${Platform.lineTerminator} assets:${Platform.lineTerminator} - assets/read-only.txt${Platform.lineTerminator}',
6867
);
6968
await pubspec.writeAsString(content, flush: true);
7069

7170
section('Add plugins');
7271

7372
content = await pubspec.readAsString();
7473
content = content.replaceFirst(
75-
'${platformLineSep}dependencies:$platformLineSep',
76-
'${platformLineSep}dependencies:$platformLineSep',
74+
'${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
75+
'${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
7776
);
7877
await pubspec.writeAsString(content, flush: true);
7978
await inDirectory(projectDir, () async {

‎dev/devicelab/bin/tasks/plugin_dependencies_test.dart‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import 'package:flutter_devicelab/framework/task_result.dart';
1111
import 'package:flutter_devicelab/framework/utils.dart';
1212
import 'package:path/path.dart' as path;
1313

14-
final String platformLineSep = Platform.isWindows ? '\r\n': '\n';
15-
1614
/// Tests that a plugin A can depend on platform code from a plugin B
1715
/// as long as plugin B is defined as a pub dependency of plugin A.
1816
///
@@ -154,14 +152,14 @@ public class DummyPluginBClass {
154152
final File pluginApubspec = File(path.join(pluginADirectory.path, 'pubspec.yaml'));
155153
String pluginApubspecContent = await pluginApubspec.readAsString();
156154
pluginApubspecContent = pluginApubspecContent.replaceFirst(
157-
'${platformLineSep}dependencies:$platformLineSep',
158-
'${platformLineSep}dependencies:$platformLineSep'
159-
' plugin_b:$platformLineSep'
160-
' path: ${pluginBDirectory.path}$platformLineSep'
161-
' plugin_c:$platformLineSep'
162-
' path: ${pluginCDirectory.path}$platformLineSep'
163-
' plugin_d:$platformLineSep'
164-
' path: ${pluginDDirectory.path}$platformLineSep',
155+
'${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
156+
'${Platform.lineTerminator}dependencies:${Platform.lineTerminator}'
157+
' plugin_b:${Platform.lineTerminator}'
158+
' path: ${pluginBDirectory.path}${Platform.lineTerminator}'
159+
' plugin_c:${Platform.lineTerminator}'
160+
' path: ${pluginCDirectory.path}${Platform.lineTerminator}'
161+
' plugin_d:${Platform.lineTerminator}'
162+
' path: ${pluginDDirectory.path}${Platform.lineTerminator}',
165163
);
166164
await pluginApubspec.writeAsString(pluginApubspecContent, flush: true);
167165

‎dev/devicelab/lib/framework/apk_utils.dart‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ import 'package:path/path.dart' as path;
99
import 'task_result.dart';
1010
import 'utils.dart';
1111

12-
final String platformLineSep = Platform.isWindows ? '\r\n' : '\n';
13-
1412
final List<String> flutterAssets = <String>[
1513
'assets/flutter_assets/AssetManifest.json',
1614
'assets/flutter_assets/NOTICES.Z',
@@ -280,8 +278,8 @@ android {
280278
final File pubspec = File(path.join(rootPath, 'pubspec.yaml'));
281279
String content = pubspec.readAsStringSync();
282280
content = content.replaceFirst(
283-
'${platformLineSep}dependencies:$platformLineSep',
284-
'${platformLineSep}dependencies:$platformLineSep $plugin: $value$platformLineSep',
281+
'${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
282+
'${Platform.lineTerminator}dependencies:${Platform.lineTerminator} $plugin: $value${Platform.lineTerminator}',
285283
);
286284
pubspec.writeAsStringSync(content, flush: true);
287285
}
@@ -336,7 +334,7 @@ android {
336334
path.join(parent.path, 'hello', 'pubspec.yaml')
337335
);
338336
final String contents = pubspec.readAsStringSync();
339-
final String newContents = contents.replaceFirst('${platformLineSep}flutter:$platformLineSep', '''
337+
final String newContents = contents.replaceFirst('${Platform.lineTerminator}flutter:${Platform.lineTerminator}', '''
340338
341339
flutter:
342340
assets:

‎dev/integration_tests/new_gallery/test/utils.dart‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)