firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Also deleted a file that appeared to be unused.
This commit is contained in:
Matan Lurey 2024-11-22 11:41:08 -08:00 committed by GitHub
parent b310baf41a
commit d29a888bf2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 34 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dev/devicelab/bin/tasks/build_aar_module_test.dart
View File

@ -10,8 +10,6 @@ import 'package:flutter_devicelab/framework/task_result.dart';
import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/framework/utils.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
final String platformLineSep = Platform.isWindows ? '\r\n': '\n';
/// Tests that AARs can be built on module projects. /// Tests that AARs can be built on module projects.
Future<void> main() async { Future<void> main() async {
await task(() async { await task(() async {
@ -59,12 +57,12 @@ Future<void> main() async {
final File modulePubspec = File(path.join(projectDir.path, 'pubspec.yaml')); final File modulePubspec = File(path.join(projectDir.path, 'pubspec.yaml'));
String content = modulePubspec.readAsStringSync(); String content = modulePubspec.readAsStringSync();
content = content.replaceFirst( content = content.replaceFirst(
'${platformLineSep}dependencies:$platformLineSep', '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
'${platformLineSep}dependencies:$platformLineSep' '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}'
' plugin_with_android:$platformLineSep' ' plugin_with_android:${Platform.lineTerminator}'
' path: ../plugin_with_android$platformLineSep' ' path: ../plugin_with_android${Platform.lineTerminator}'
' plugin_without_android:$platformLineSep' ' plugin_without_android:${Platform.lineTerminator}'
' path: ../plugin_without_android$platformLineSep' ' path: ../plugin_without_android${Platform.lineTerminator}'
); );
modulePubspec.writeAsStringSync(content, flush: true); modulePubspec.writeAsStringSync(content, flush: true);

13
dev/devicelab/bin/tasks/build_android_host_app_with_module_aar.dart
View File

@ -17,7 +17,6 @@ final String gradlew = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
final String gradlewExecutable = final String gradlewExecutable =
Platform.isWindows ? '.\\$gradlew' : './$gradlew'; Platform.isWindows ? '.\\$gradlew' : './$gradlew';
final String fileReadWriteMode = Platform.isWindows ? 'rw-rw-rw-' : 'rw-r--r--'; 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. /// Combines several TaskFunctions with trivial success value into one.
TaskFunction combine(List<TaskFunction> tasks) { TaskFunction combine(List<TaskFunction> tasks) {
@ -79,8 +78,8 @@ class ModuleTest {
final File pubspec = File(path.join(projectDir.path, 'pubspec.yaml')); final File pubspec = File(path.join(projectDir.path, 'pubspec.yaml'));
String content = await pubspec.readAsString(); String content = await pubspec.readAsString();
content = content.replaceFirst( content = content.replaceFirst(
'dependencies:$platformLineSep', 'dependencies:${Platform.lineTerminator}',
'dependencies:$platformLineSep $ffiPackageName:$platformLineSep path: ..${Platform.pathSeparator}$ffiPackageName$platformLineSep', 'dependencies:${Platform.lineTerminator} $ffiPackageName:${Platform.lineTerminator} path: ..${Platform.pathSeparator}$ffiPackageName${Platform.lineTerminator}',
); );
await pubspec.writeAsString(content, flush: true); await pubspec.writeAsString(content, flush: true);
await inDirectory(projectDir, () async { await inDirectory(projectDir, () async {
@ -111,16 +110,16 @@ class ModuleTest {
} }
content = content.replaceFirst( content = content.replaceFirst(
'$platformLineSep # assets:$platformLineSep', '${Platform.lineTerminator} # assets:${Platform.lineTerminator}',
'$platformLineSep assets:$platformLineSep - assets/read-only.txt$platformLineSep', '${Platform.lineTerminator} assets:${Platform.lineTerminator} - assets/read-only.txt${Platform.lineTerminator}',
); );
await pubspec.writeAsString(content, flush: true); await pubspec.writeAsString(content, flush: true);
section('Add plugins'); section('Add plugins');
content = content.replaceFirst( content = content.replaceFirst(
'${platformLineSep}dependencies:$platformLineSep', '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
'${platformLineSep}dependencies:$platformLineSep', '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
); );
await pubspec.writeAsString(content, flush: true); await pubspec.writeAsString(content, flush: true);
await inDirectory(projectDir, () async { await inDirectory(projectDir, () async {

13
dev/devicelab/bin/tasks/build_android_host_app_with_module_source.dart
View File

@ -17,7 +17,6 @@ final String gradlew = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
final String gradlewExecutable = final String gradlewExecutable =
Platform.isWindows ? '.\\$gradlew' : './$gradlew'; Platform.isWindows ? '.\\$gradlew' : './$gradlew';
final String fileReadWriteMode = Platform.isWindows ? 'rw-rw-rw-' : 'rw-r--r--'; 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. /// Combines several TaskFunctions with trivial success value into one.
TaskFunction combine(List<TaskFunction> tasks) { TaskFunction combine(List<TaskFunction> tasks) {
@ -79,8 +78,8 @@ class ModuleTest {
final File pubspec = File(path.join(projectDir.path, 'pubspec.yaml')); final File pubspec = File(path.join(projectDir.path, 'pubspec.yaml'));
String content = await pubspec.readAsString(); String content = await pubspec.readAsString();
content = content.replaceFirst( content = content.replaceFirst(
'dependencies:$platformLineSep', 'dependencies:${Platform.lineTerminator}',
'dependencies:$platformLineSep $ffiPackageName:$platformLineSep path: ..${Platform.pathSeparator}$ffiPackageName$platformLineSep', 'dependencies:${Platform.lineTerminator} $ffiPackageName:${Platform.lineTerminator} path: ..${Platform.pathSeparator}$ffiPackageName${Platform.lineTerminator}',
); );
await pubspec.writeAsString(content, flush: true); await pubspec.writeAsString(content, flush: true);
await inDirectory(projectDir, () async { await inDirectory(projectDir, () async {
@ -111,16 +110,16 @@ class ModuleTest {
} }
content = content.replaceFirst( content = content.replaceFirst(
'$platformLineSep # assets:$platformLineSep', '${Platform.lineTerminator} # assets:${Platform.lineTerminator}',
'$platformLineSep assets:$platformLineSep - assets/read-only.txt$platformLineSep', '${Platform.lineTerminator} assets:${Platform.lineTerminator} - assets/read-only.txt${Platform.lineTerminator}',
); );
await pubspec.writeAsString(content, flush: true); await pubspec.writeAsString(content, flush: true);
section('Add plugins'); section('Add plugins');
content = content.replaceFirst( content = content.replaceFirst(
'${platformLineSep}dependencies:$platformLineSep', '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
'${platformLineSep}dependencies:$platformLineSep', '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
); );
await pubspec.writeAsString(content, flush: true); await pubspec.writeAsString(content, flush: true);
await inDirectory(projectDir, () async { await inDirectory(projectDir, () async {

2
dev/devicelab/bin/tasks/gradle_plugin_light_apk_test.dart
View File

@ -211,7 +211,7 @@ Future<void> main() async {
section('Configure'); section('Configure');
project.addPlugin('plugin_under_test', project.addPlugin('plugin_under_test',
value: '$platformLineSep path: ${pluginDir.path}'); value: '${Platform.lineTerminator} path: ${pluginDir.path}');
await project.addCustomBuildType('local', initWith: 'debug'); await project.addCustomBuildType('local', initWith: 'debug');
await project.getPackages(); await project.getPackages();

9
dev/devicelab/bin/tasks/module_custom_host_app_name_test.dart
View File

@ -13,7 +13,6 @@ import 'package:path/path.dart' as path;
final String gradlew = Platform.isWindows ? 'gradlew.bat' : 'gradlew'; final String gradlew = Platform.isWindows ? 'gradlew.bat' : 'gradlew';
final String gradlewExecutable = Platform.isWindows ? '.\\$gradlew' : './$gradlew'; final String gradlewExecutable = Platform.isWindows ? '.\\$gradlew' : './$gradlew';
final String fileReadWriteMode = Platform.isWindows ? 'rw-rw-rw-' : 'rw-r--r--'; 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 /// Tests that the Flutter module project template works and supports
/// adding Flutter to an existing Android app. /// adding Flutter to an existing Android app.
@ -63,8 +62,8 @@ Future<void> main() async {
final File pubspec = File(path.join(projectDir.path, 'pubspec.yaml')); final File pubspec = File(path.join(projectDir.path, 'pubspec.yaml'));
String content = await pubspec.readAsString(); String content = await pubspec.readAsString();
content = content.replaceFirst( content = content.replaceFirst(
'$platformLineSep # assets:$platformLineSep', '${Platform.lineTerminator} # assets:${Platform.lineTerminator}',
'$platformLineSep assets:$platformLineSep - assets/read-only.txt$platformLineSep', '${Platform.lineTerminator} assets:${Platform.lineTerminator} - assets/read-only.txt${Platform.lineTerminator}',
); );
await pubspec.writeAsString(content, flush: true); await pubspec.writeAsString(content, flush: true);
@ -72,8 +71,8 @@ Future<void> main() async {
content = await pubspec.readAsString(); content = await pubspec.readAsString();
content = content.replaceFirst( content = content.replaceFirst(
'${platformLineSep}dependencies:$platformLineSep', '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
'${platformLineSep}dependencies:$platformLineSep', '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
); );
await pubspec.writeAsString(content, flush: true); await pubspec.writeAsString(content, flush: true);
await inDirectory(projectDir, () async { await inDirectory(projectDir, () async {

18
dev/devicelab/bin/tasks/plugin_dependencies_test.dart
View File

@ -11,8 +11,6 @@ import 'package:flutter_devicelab/framework/task_result.dart';
import 'package:flutter_devicelab/framework/utils.dart'; import 'package:flutter_devicelab/framework/utils.dart';
import 'package:path/path.dart' as path; 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 /// 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. /// 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')); final File pluginApubspec = File(path.join(pluginADirectory.path, 'pubspec.yaml'));
String pluginApubspecContent = await pluginApubspec.readAsString(); String pluginApubspecContent = await pluginApubspec.readAsString();
pluginApubspecContent = pluginApubspecContent.replaceFirst( pluginApubspecContent = pluginApubspecContent.replaceFirst(
'${platformLineSep}dependencies:$platformLineSep', '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
'${platformLineSep}dependencies:$platformLineSep' '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}'
' plugin_b:$platformLineSep' ' plugin_b:${Platform.lineTerminator}'
' path: ${pluginBDirectory.path}$platformLineSep' ' path: ${pluginBDirectory.path}${Platform.lineTerminator}'
' plugin_c:$platformLineSep' ' plugin_c:${Platform.lineTerminator}'
' path: ${pluginCDirectory.path}$platformLineSep' ' path: ${pluginCDirectory.path}${Platform.lineTerminator}'
' plugin_d:$platformLineSep' ' plugin_d:${Platform.lineTerminator}'
' path: ${pluginDDirectory.path}$platformLineSep', ' path: ${pluginDDirectory.path}${Platform.lineTerminator}',
); );
await pluginApubspec.writeAsString(pluginApubspecContent, flush: true); await pluginApubspec.writeAsString(pluginApubspecContent, flush: true);

8
dev/devicelab/lib/framework/apk_utils.dart
View File

@ -9,8 +9,6 @@ import 'package:path/path.dart' as path;
import 'task_result.dart'; import 'task_result.dart';
import 'utils.dart'; import 'utils.dart';
final String platformLineSep = Platform.isWindows ? '\r\n' : '\n';
final List<String> flutterAssets = <String>[ final List<String> flutterAssets = <String>[
'assets/flutter_assets/AssetManifest.json', 'assets/flutter_assets/AssetManifest.json',
'assets/flutter_assets/NOTICES.Z', 'assets/flutter_assets/NOTICES.Z',
@ -280,8 +278,8 @@ android {
final File pubspec = File(path.join(rootPath, 'pubspec.yaml')); final File pubspec = File(path.join(rootPath, 'pubspec.yaml'));
String content = pubspec.readAsStringSync(); String content = pubspec.readAsStringSync();
content = content.replaceFirst( content = content.replaceFirst(
'${platformLineSep}dependencies:$platformLineSep', '${Platform.lineTerminator}dependencies:${Platform.lineTerminator}',
'${platformLineSep}dependencies:$platformLineSep $plugin: $value$platformLineSep', '${Platform.lineTerminator}dependencies:${Platform.lineTerminator} $plugin: $value${Platform.lineTerminator}',
); );
pubspec.writeAsStringSync(content, flush: true); pubspec.writeAsStringSync(content, flush: true);
} }
@ -336,7 +334,7 @@ android {
path.join(parent.path, 'hello', 'pubspec.yaml') path.join(parent.path, 'hello', 'pubspec.yaml')
); );
final String contents = pubspec.readAsStringSync(); final String contents = pubspec.readAsStringSync();
final String newContents = contents.replaceFirst('${platformLineSep}flutter:$platformLineSep', ''' final String newContents = contents.replaceFirst('${Platform.lineTerminator}flutter:${Platform.lineTerminator}', '''
flutter: flutter:
assets: assets:

6
dev/integration_tests/new_gallery/test/utils.dart
View File

@ -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');