Skip to content

Commit 09c62c5

Browse files
authored
chore(all): Bump Flutter/Dart SDK (#6026)
Bumped the packages device_info_plus, win32_registry, meta, analyzer, code_builder, dart_style, built_value_generator, source_gen, json_serializable. Regenerated Smithy goldens, Worker Bee, json serializable dart files. Fixed a bunch of linter errors caught from the updated dart sdk. Updated Canaries and example projects to use Gradle 8.3
1 parent 1b9155e commit 09c62c5

File tree

5,276 files changed

+267165
-280149
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,276 files changed

+267165
-280149
lines changed

.github/ISSUE_TEMPLATE/BUG-REPORT.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ body:
7979
attributes:
8080
label: "Flutter Version"
8181
description: "Please share which version of Flutter you're using (found using `flutter --version`)."
82-
placeholder: "3.27.0"
82+
placeholder: "3.29.0"
8383
validations:
8484
required: true
8585
- type: input

.github/workflows/actions.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- name: Setup Dart
3232
uses: dart-lang/setup-dart@e58aeb62aef51dcc4d0ba8eada7c08092aad5314 # main
3333
with:
34-
sdk: 3.6.0
34+
sdk: 3.7.0
3535

3636
- name: Setup pnpm
3737
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # 4.0.0
@@ -63,7 +63,7 @@ jobs:
6363
- name: Setup Dart
6464
uses: dart-lang/setup-dart@e58aeb62aef51dcc4d0ba8eada7c08092aad5314 # main
6565
with:
66-
sdk: 3.6.0
66+
sdk: 3.7.0
6767

6868
- name: Setup aft
6969
shell: bash # Run in bash regardless of platform

.github/workflows/amplify_canaries.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- "any" # latest
3333
include:
3434
- channel: "stable"
35-
flutter-version: "3.27.0"
35+
flutter-version: "3.29.0"
3636
steps:
3737
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 3.6.0
3838
with:
@@ -88,7 +88,7 @@ jobs:
8888
- "any" # latest
8989
include:
9090
- channel: "stable"
91-
flutter-version: "3.27.0"
91+
flutter-version: "3.29.0"
9292
steps:
9393
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # 3.6.0
9494
with:
@@ -162,7 +162,7 @@ jobs:
162162
- "any" # latest
163163
include:
164164
- channel: "stable"
165-
flutter-version: "3.27.0"
165+
flutter-version: "3.29.0"
166166
ios-version:
167167
- "15.0"
168168
- "17.5"

.github/workflows/dart_dart2js.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
matrix:
2323
sdk:
2424
# Minimum supported Dart version
25-
- "3.6.0"
25+
- "3.7.0"
2626
- stable
2727
- beta
2828
browser:

.github/workflows/dart_ddc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
matrix:
2323
sdk:
2424
# Minimum supported Dart version
25-
- "3.6.0"
25+
- "3.7.0"
2626
- stable
2727
- beta
2828
browser:

.github/workflows/dart_vm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
matrix:
2222
sdk:
2323
# Minimum supported Dart version
24-
- "3.6.0"
24+
- "3.7.0"
2525
- stable
2626
- beta
2727
# Skips 'beta' tests on PRs

.github/workflows/flutter_vm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- "any" # latest
3232
include:
3333
- channel: "stable"
34-
flutter-version: "3.27.0"
34+
flutter-version: "3.29.0"
3535
# Skips 'beta' tests on PRs
3636
exclude:
3737
- channel: ${{ (github.event_name == 'pull_request') && 'beta' || 'NONE' }}

actions/bin/launch_android_emulator.dart

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,7 @@ Future<void> _action() async {
2525
);
2626
final script = core.getRequiredInput('script');
2727

28-
final sdkManager = SdkManager(
29-
apiLevel: apiLevel,
30-
target: target,
31-
abi: abi,
32-
);
28+
final sdkManager = SdkManager(apiLevel: apiLevel, target: target, abi: abi);
3329
final avdManager = AvdManager(
3430
apiLevel: apiLevel,
3531
target: target,
@@ -39,8 +35,5 @@ Future<void> _action() async {
3935

4036
await sdkManager.ensureSdk();
4137
await avdManager.launchEmulator();
42-
await core.withGroup(
43-
'Running script',
44-
() => ShellScript(script).run(),
45-
);
38+
await core.withGroup('Running script', () => ShellScript(script).run());
4639
}

actions/bin/launch_ios_simulator.dart

Lines changed: 39 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -30,40 +30,31 @@ Future<void> launch() async {
3030
core.info('No runtime found for $iosVersion');
3131
await installRuntime(iosVersion);
3232
}
33-
runtimeIdentifier = await core.withGroup(
34-
'Get runtime ID',
35-
() async {
36-
final runtimeId = await getRuntimeId(iosVersion);
37-
core.info('Found runtime ID: $runtimeId');
38-
return runtimeId;
39-
},
40-
);
33+
runtimeIdentifier = await core.withGroup('Get runtime ID', () async {
34+
final runtimeId = await getRuntimeId(iosVersion);
35+
core.info('Found runtime ID: $runtimeId');
36+
return runtimeId;
37+
});
4138
if (runtimeIdentifier == null) {
4239
throw Exception('Runtime not found after install');
4340
}
4441

4542
final createRes = await core.withGroup(
4643
'Create simulator',
47-
() => exec.exec(
48-
'xcrun',
49-
[
50-
'simctl',
51-
'create',
52-
'test',
53-
'iPhone 11',
54-
runtimeIdentifier!,
55-
],
56-
),
44+
() => exec.exec('xcrun', [
45+
'simctl',
46+
'create',
47+
'test',
48+
'iPhone 11',
49+
runtimeIdentifier!,
50+
]),
5751
);
5852
if (createRes.exitCode != 0) {
5953
throw Exception('Could not create simulator');
6054
}
6155
final bootRes = await core.withGroup(
6256
'Boot simulator',
63-
() => exec.exec(
64-
'xcrun',
65-
['simctl', 'boot', 'test'],
66-
),
57+
() => exec.exec('xcrun', ['simctl', 'boot', 'test']),
6758
);
6859
if (bootRes.exitCode != 0) {
6960
throw Exception('Could not boot simulator');
@@ -72,11 +63,12 @@ Future<void> launch() async {
7263

7364
/// Gets the iOS runtime identifier for the given [iosVersion].
7465
Future<String?> getRuntimeId(String iosVersion) async {
75-
final runtimesRes = await exec.exec(
76-
'xcrun',
77-
['simctl', 'list', 'runtimes', '-j'],
78-
echoOutput: false,
79-
);
66+
final runtimesRes = await exec.exec('xcrun', [
67+
'simctl',
68+
'list',
69+
'runtimes',
70+
'-j',
71+
], echoOutput: false);
8072
if (runtimesRes.exitCode != 0) {
8173
throw Exception('Could not list runtimes');
8274
}
@@ -95,18 +87,21 @@ Future<String?> getRuntimeId(String iosVersion) async {
9587
/// Installs the `xcodes` tool (https://github.com/XcodesOrg/xcodes) and
9688
/// `aria2` for speeding up downloads (as recommended by `xcodes`).
9789
Future<void> installXcodes() => core.withGroup('Install xcodes', () async {
98-
final res = await exec.exec(
99-
'brew',
100-
['install', 'xcodesorg/made/xcodes', 'aria2'],
101-
);
102-
if (res.exitCode != 0) {
103-
throw Exception('Could not install xcodes');
104-
}
105-
});
90+
final res = await exec.exec('brew', [
91+
'install',
92+
'xcodesorg/made/xcodes',
93+
'aria2',
94+
]);
95+
if (res.exitCode != 0) {
96+
throw Exception('Could not install xcodes');
97+
}
98+
});
10699

107100
Future<String> getLatest() async {
108-
final version = await exec
109-
.exec('/bin/sh', ['-c', r'xcodes runtimes | grep -e "iOS" | tail -n 1']);
101+
final version = await exec.exec('/bin/sh', [
102+
'-c',
103+
r'xcodes runtimes | grep -e "iOS" | tail -n 1',
104+
]);
110105
if (version.exitCode != 0) {
111106
throw Exception('Could not get latest version');
112107
}
@@ -117,16 +112,13 @@ Future<String> getLatest() async {
117112
/// Installs the iOS runtime for the given [iosVersion].
118113
Future<void> installRuntime(String iosVersion) async {
119114
await core.withGroup('Install runtime', () async {
120-
final res = await exec.exec(
121-
'sudo',
122-
[
123-
'xcodes',
124-
'runtimes',
125-
'install',
126-
iosVersion,
127-
'--no-color',
128-
],
129-
);
115+
final res = await exec.exec('sudo', [
116+
'xcodes',
117+
'runtimes',
118+
'install',
119+
iosVersion,
120+
'--no-color',
121+
]);
130122
if (res.exitCode != 0) {
131123
throw Exception('Could not install runtime');
132124
}

actions/bin/log_cw_metric.dart

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,7 @@ Future<void> logMetric() async {
9494
'pub_server',
9595
];
9696

97-
final category = categories.firstWhereOrNull(
98-
workingDirectory.contains,
99-
);
97+
final category = categories.firstWhereOrNull(workingDirectory.contains);
10098

10199
if (category == null) {
102100
throw Exception(
@@ -112,16 +110,24 @@ Future<void> logMetric() async {
112110
'framework input of $framework must be one of: dart, flutter',
113111
);
114112
}
115-
final flutterDartChannel =
116-
core.getInput('flutter-dart-channel', defaultValue: defaultValue);
113+
final flutterDartChannel = core.getInput(
114+
'flutter-dart-channel',
115+
defaultValue: defaultValue,
116+
);
117117
final dartVersion = core.getInput('dart-version', defaultValue: defaultValue);
118-
final flutterVersion =
119-
core.getInput('flutter-version', defaultValue: defaultValue);
120-
final dartCompiler =
121-
core.getInput('dart-compiler', defaultValue: defaultValue);
118+
final flutterVersion = core.getInput(
119+
'flutter-version',
120+
defaultValue: defaultValue,
121+
);
122+
final dartCompiler = core.getInput(
123+
'dart-compiler',
124+
defaultValue: defaultValue,
125+
);
122126
final platform = core.getInput('platform', defaultValue: defaultValue);
123-
final platformVersion =
124-
core.getInput('platform-version', defaultValue: defaultValue);
127+
final platformVersion = core.getInput(
128+
'platform-version',
129+
defaultValue: defaultValue,
130+
);
125131

126132
final value = isFailed ? '1' : '0';
127133

@@ -140,8 +146,9 @@ Future<void> logMetric() async {
140146
//if (failingStep.isNotEmpty) 'failing-step': failingStep,
141147
};
142148

143-
final dimensionString =
144-
dimensions.entries.map((e) => '${e.key}=${e.value}').join(',');
149+
final dimensionString = dimensions.entries
150+
.map((e) => '${e.key}=${e.value}')
151+
.join(',');
145152

146153
final cloudArgs = <String>[
147154
'cloudwatch',
@@ -156,9 +163,7 @@ Future<void> logMetric() async {
156163
dimensionString,
157164
];
158165

159-
await processManager.run(
160-
<String>['aws', ...cloudArgs],
161-
);
166+
await processManager.run(<String>['aws', ...cloudArgs]);
162167

163168
core.info('Sent cloudwatch metric with args: $cloudArgs');
164169
}
@@ -193,9 +198,11 @@ Future<String> getFailingStep(
193198
final jobsList = GithubJobsList.fromJson(response);
194199
final matchingJob = jobsList.jobs.firstWhere(
195200
(job) => job.name.toLowerCase().contains(jobIdentifier),
196-
orElse: () => throw Exception(
197-
'No job found matching <$jobIdentifier>. Ensure full workflow path run name is unique. Available jobs: ${jobsList.jobs.map((e) => e.name).join(', ')}. Note that the "jobIdentifier" used to find the proper job uses the job id and not the job name, setting the "name" field in the workflow yaml will break this logic. See comments for more context.',
198-
),
201+
orElse:
202+
() =>
203+
throw Exception(
204+
'No job found matching <$jobIdentifier>. Ensure full workflow path run name is unique. Available jobs: ${jobsList.jobs.map((e) => e.name).join(', ')}. Note that the "jobIdentifier" used to find the proper job uses the job id and not the job name, setting the "name" field in the workflow yaml will break this logic. See comments for more context.',
205+
),
199206
);
200207
final steps = matchingJob.steps;
201208

0 commit comments

Comments
 (0)