Skip to content

Replace \r\n code with Dart SDK standard conventions. #159346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 1 commit into from
Nov 22, 2024
Merged

Replace \r\n code with Dart SDK standard conventions. #159346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions dev/devicelab/bin/tasks/build_aar_module_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<void> main() async {
await task(() async {
Expand Down Expand Up @@ -59,12 +57,12 @@ Future<void> 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);

Expand Down
13 changes: 6 additions & 7 deletions dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<TaskFunction> tasks) {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
13 changes: 6 additions & 7 deletions dev/devicelab/bin/tasks/build_android_host_app_with_module_source.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<TaskFunction> tasks) {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ Future<void> 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();

Expand Down
9 changes: 4 additions & 5 deletions dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -63,17 +62,17 @@ Future<void> 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);

section('Add plugins');

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 {
Expand Down
18 changes: 8 additions & 10 deletions dev/devicelab/bin/tasks/plugin_dependencies_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down Expand Up @@ -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);

Expand Down
8 changes: 3 additions & 5 deletions dev/devicelab/lib/framework/apk_utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> flutterAssets = <String>[
'assets/flutter_assets/AssetManifest.json',
'assets/flutter_assets/NOTICES.Z',
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 0 additions & 6 deletions dev/integration_tests/new_gallery/test/utils.dart
View file
Open in desktop

This file was deleted.