From 29edad8ab028b48b203ff7c9baaa95b961ce827a Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 21 Dec 2022 09:26:32 -0500 Subject: [PATCH 1/3] manual roll to first failing hash --- .ci/flutter_master.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/flutter_master.version b/.ci/flutter_master.version index 90e09469cc1..96fe5809cb7 100644 --- a/.ci/flutter_master.version +++ b/.ci/flutter_master.version @@ -1 +1 @@ -9102f2fe0bd26db6074ac4a17785296cd341ecb9 +7b850ef3750083212039f1e62b39cb71072e88f3 From 08c4e1769799ceea8a4fdf8111260d5da51997a0 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 21 Dec 2022 09:55:40 -0500 Subject: [PATCH 2/3] Fix new analyzer warnings --- packages/flutter_migrate/test/base/logger_test.dart | 2 +- packages/pigeon/lib/cpp_generator.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/flutter_migrate/test/base/logger_test.dart b/packages/flutter_migrate/test/base/logger_test.dart index da055220eeb..2da9329481d 100644 --- a/packages/flutter_migrate/test/base/logger_test.dart +++ b/packages/flutter_migrate/test/base/logger_test.dart @@ -45,7 +45,7 @@ void main() { final WindowsStdoutLogger logger = WindowsStdoutLogger( outputPreferences: OutputPreferences.test(), stdio: stdio, - terminal: Terminal.test(supportsColor: false, supportsEmoji: false), + terminal: Terminal.test(), ); logger.printStatus('🔥🖼️✗✓🔨💪✏️'); diff --git a/packages/pigeon/lib/cpp_generator.dart b/packages/pigeon/lib/cpp_generator.dart index 744f6e9ffce..60fd6ff8b0c 100644 --- a/packages/pigeon/lib/cpp_generator.dart +++ b/packages/pigeon/lib/cpp_generator.dart @@ -773,7 +773,7 @@ const flutter::StandardMessageCodec& ${api.name}::GetCodec() { final Iterable argNames = indexMap(func.arguments, _getSafeArgumentName); sendArgument = - 'flutter::EncodableList { ${(argNames.map((String arg) => 'flutter::CustomEncodableValue($arg)')).join(', ')} }'; + 'flutter::EncodableList { ${argNames.map((String arg) => 'flutter::CustomEncodableValue($arg)').join(', ')} }'; final String argsSignature = map2(argTypes, argNames, (String x, String y) => '$x $y').join(', '); indent From 2772c4b9fc35b696a79bf5caaa9b307efa707cf0 Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Wed, 21 Dec 2022 10:04:39 -0500 Subject: [PATCH 3/3] Update/move some pinned dependencies --- packages/flutter_migrate/pubspec.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/flutter_migrate/pubspec.yaml b/packages/flutter_migrate/pubspec.yaml index 3704d5b35ed..0cc819bf2f5 100644 --- a/packages/flutter_migrate/pubspec.yaml +++ b/packages/flutter_migrate/pubspec.yaml @@ -16,8 +16,6 @@ dependencies: meta: 1.8.0 path: ^1.8.0 process: 4.2.4 - test_api: 0.4.13 - test_core: 0.4.17 vm_service: 9.3.0 xml: ^6.1.0 yaml: 3.1.1 @@ -27,3 +25,4 @@ dev_dependencies: file_testing: ^3.0.0 lints: ^2.0.0 test: ^1.16.0 + test_api: ^0.4.13