Skip to content

[ci] Roll Flutter master to 7b850ef37500 #2991

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
merged 3 commits into from
Dec 21, 2022
Merged

[ci] Roll Flutter master to 7b850ef37500 #2991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29edad8
manual roll to first failing hash
stuartmorgan-g Dec 21, 2022
08c4e17
Fix new analyzer warnings
stuartmorgan-g Dec 21, 2022
2772c4b
Update/move some pinned dependencies
stuartmorgan-g Dec 21, 2022
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
2 changes: 1 addition & 1 deletion .ci/flutter_master.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9102f2fe0bd26db6074ac4a17785296cd341ecb9
7b850ef3750083212039f1e62b39cb71072e88f3
3 changes: 1 addition & 2 deletions packages/flutter_migrate/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,3 +25,4 @@ dev_dependencies:
file_testing: ^3.0.0
lints: ^2.0.0
test: ^1.16.0
test_api: ^0.4.13
Copy link
Contributor Author

@stuartmorgan-g stuartmorgan-g Dec 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GaryQian I made the minimal changes to pick up the version of matcher (a transitive dependency) that fixes the roll, but do so many of the dependencies in this package actually need to be pinned, or is that just a legacy of this code coming from flutter/flutter? If the latter, we should make them all ^ range dependencies to make this package less fragile, otherwise this kind of roll breakage is going to keep happening.

2 changes: 1 addition & 1 deletion packages/flutter_migrate/test/base/logger_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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('🔥🖼️✗✓🔨💪✏️');
Expand Down
2 changes: 1 addition & 1 deletion packages/pigeon/lib/cpp_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ const flutter::StandardMessageCodec& ${api.name}::GetCodec() {
final Iterable<String> 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
Expand Down