Skip to content

Commit 09e1278

Browse files
Bump flutter candidate and update formatting. (#9165)
1 parent 2f4301e commit 09e1278

File tree

335 files changed

+5632
-6196
lines changed

Some content is hidden

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

335 files changed

+5632
-6196
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
wget -qO- https://dcm.dev/pgp-key.public | sudo gpg --dearmor -o /usr/share/keyrings/dcm.gpg
7575
echo 'deb [signed-by=/usr/share/keyrings/dcm.gpg arch=amd64] https://dcm.dev/debian stable main' | sudo tee /etc/apt/sources.list.d/dart_stable.list
7676
sudo apt-get update
77-
sudo apt-get install dcm=1.24.2-1 # To avoid errors add `-1` (build number) to the version
77+
sudo apt-get install dcm=1.28.0-1 # To avoid errors add `-1` (build number) to the version
7878
sudo chmod +x /usr/bin/dcm
7979
echo "$(dcm --version)"
8080
- name: Setup Dart SDK

flutter-candidate.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
a7f820163c5d7d5321872c60f22fa047fb94bd7b
1+
80d0409d137acdd55af4124b7622915c062c9d21

packages/devtools_app/benchmark/devtools_benchmarks_test.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,9 @@ Future<void> _runBenchmarks({bool useWasm = false}) async {
5353
final taskResult = await serveWebBenchmark(
5454
benchmarkAppDirectory: projectRootDirectory(),
5555
entryPoint: generateBenchmarkEntryPoint(useWasm: useWasm),
56-
compilationOptions:
57-
useWasm
58-
? const CompilationOptions.wasm()
59-
: const CompilationOptions.js(),
56+
compilationOptions: useWasm
57+
? const CompilationOptions.wasm()
58+
: const CompilationOptions.js(),
6059
treeShakeIcons: false,
6160
benchmarkPath: benchmarkPath(useWasm: useWasm),
6261
);

packages/devtools_app/benchmark/scripts/run_benchmarks.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@ Future<BenchmarkResults> runBenchmarks({
5656
await serveWebBenchmark(
5757
benchmarkAppDirectory: projectRootDirectory(),
5858
entryPoint: generateBenchmarkEntryPoint(useWasm: useWasm),
59-
compilationOptions:
60-
useWasm
61-
? const CompilationOptions.wasm()
62-
: const CompilationOptions.js(),
59+
compilationOptions: useWasm
60+
? const CompilationOptions.wasm()
61+
: const CompilationOptions.js(),
6362
treeShakeIcons: false,
6463
benchmarkPath: benchmarkPath(useWasm: useWasm),
6564
headless: !useBrowser,

packages/devtools_app/benchmark/test_infra/client/client_shared.dart

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,11 @@ import '../devtools_recorder.dart';
1010
typedef RecorderFactory = Recorder Function();
1111

1212
final benchmarks = <String, RecorderFactory>{
13-
DevToolsBenchmark.navigateThroughOfflineScreens.id:
14-
() => DevToolsRecorder(
15-
benchmark: DevToolsBenchmark.navigateThroughOfflineScreens,
16-
),
17-
DevToolsBenchmark.offlineCpuProfilerScreen.id:
18-
() => DevToolsRecorder(
19-
benchmark: DevToolsBenchmark.offlineCpuProfilerScreen,
20-
),
21-
DevToolsBenchmark.offlinePerformanceScreen.id:
22-
() => DevToolsRecorder(
23-
benchmark: DevToolsBenchmark.offlinePerformanceScreen,
24-
),
13+
DevToolsBenchmark.navigateThroughOfflineScreens.id: () => DevToolsRecorder(
14+
benchmark: DevToolsBenchmark.navigateThroughOfflineScreens,
15+
),
16+
DevToolsBenchmark.offlineCpuProfilerScreen.id: () =>
17+
DevToolsRecorder(benchmark: DevToolsBenchmark.offlineCpuProfilerScreen),
18+
DevToolsBenchmark.offlinePerformanceScreen.id: () =>
19+
DevToolsRecorder(benchmark: DevToolsBenchmark.offlinePerformanceScreen),
2520
};

packages/devtools_app/benchmark/test_infra/common.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ const _benchmarkInitialPage = '';
1212

1313
const _wasmQueryParameters = {'wasm': 'true'};
1414

15-
String benchmarkPath({required bool useWasm}) =>
16-
Uri(
17-
path: _benchmarkInitialPage,
18-
queryParameters: useWasm ? _wasmQueryParameters : null,
19-
).toString();
15+
String benchmarkPath({required bool useWasm}) => Uri(
16+
path: _benchmarkInitialPage,
17+
queryParameters: useWasm ? _wasmQueryParameters : null,
18+
).toString();
2019

2120
String generateBenchmarkEntryPoint({required bool useWasm}) {
2221
return 'benchmark/test_infra/client/client_${useWasm ? 'wasm' : 'js'}.dart';

packages/devtools_app/integration_test/run_tests.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ void main(List<String> args) async {
5555
testRunnerArgs: testRunnerArgs,
5656
runTest: _runTest,
5757
newArgsGenerator: (args) => DevToolsAppTestRunnerArgs(args),
58-
testIsSupported:
59-
(testFile) => testRunnerArgs.testAppDevice.supportsTest(testFile.path),
58+
testIsSupported: (testFile) =>
59+
testRunnerArgs.testAppDevice.supportsTest(testFile.path),
6060
debugLogging: debugTestScript,
6161
);
6262
}

packages/devtools_app/integration_test/test/live_connection/devtools_extensions_test.dart

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -268,11 +268,10 @@ Future<void> _verifyExtensionsSettingsMenu(
268268
await _openExtensionSettingsMenu(tester);
269269

270270
expect(find.byType(ExtensionSetting), findsNWidgets(enabledStates.length));
271-
final toggleButtonGroups =
272-
tester
273-
.widgetList(find.byType(DevToolsToggleButtonGroup))
274-
.cast<DevToolsToggleButtonGroup>()
275-
.toList();
271+
final toggleButtonGroups = tester
272+
.widgetList(find.byType(DevToolsToggleButtonGroup))
273+
.cast<DevToolsToggleButtonGroup>()
274+
.toList();
276275
for (int i = 0; i < toggleButtonGroups.length; i++) {
277276
logStatus('verify extension settings toggle button states (index $i)');
278277
final group = toggleButtonGroups[i];
@@ -313,11 +312,10 @@ Future<void> _changeExtensionSetting(
313312
'changing the extension setting at index $extensionIndex to value $settingValue',
314313
);
315314
await _openExtensionSettingsMenu(tester);
316-
final extensionSetting =
317-
tester
318-
.widgetList(find.byType(DevToolsToggleButtonGroup))
319-
.cast<DevToolsToggleButtonGroup>()
320-
.toList()[extensionIndex];
315+
final extensionSetting = tester
316+
.widgetList(find.byType(DevToolsToggleButtonGroup))
317+
.cast<DevToolsToggleButtonGroup>()
318+
.toList()[extensionIndex];
321319
await tester.tap(
322320
find.descendant(
323321
of: find.byWidget(extensionSetting),

packages/devtools_app/integration_test/test_infra/run/_test_app_driver.dart

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,9 @@ class TestFlutterApp extends IntegrationTestApp {
133133
return _timeoutWithMessages<Map<String, Object?>>(
134134
() => response.future,
135135
timeout: timeout,
136-
message:
137-
event != null
138-
? 'Did not receive expected $event event.'
139-
: 'Did not receive response to request "$id".',
136+
message: event != null
137+
? 'Did not receive expected $event event.'
138+
: 'Did not receive response to request "$id".',
140139
).whenComplete(() => sub.cancel());
141140
}
142141

@@ -350,8 +349,8 @@ abstract class IntegrationTestApp with IOMixin {
350349
_debugPrint('Waiting for process to end');
351350
return runProcess!.exitCode.timeout(
352351
IOMixin.killTimeout,
353-
onTimeout:
354-
() => killGracefully(runProcess!, debugLogging: debugTestScript),
352+
onTimeout: () =>
353+
killGracefully(runProcess!, debugLogging: debugTestScript),
355354
);
356355
}
357356

@@ -387,8 +386,9 @@ abstract class IntegrationTestApp with IOMixin {
387386

388387
String _debugPrint(String msg) {
389388
const maxLength = 500;
390-
final truncatedMsg =
391-
msg.length > maxLength ? '${msg.substring(0, maxLength)}...' : msg;
389+
final truncatedMsg = msg.length > maxLength
390+
? '${msg.substring(0, maxLength)}...'
391+
: msg;
392392
_allMessages.add(truncatedMsg);
393393
debugLog('_TestApp - $truncatedMsg');
394394
return msg;
@@ -404,12 +404,11 @@ Uri convertToWebSocketUrl({required Uri serviceProtocolUrl}) {
404404
serviceProtocolUrl.isScheme('https');
405405
final scheme = isSecure ? 'wss' : 'ws';
406406

407-
final path =
408-
serviceProtocolUrl.path.endsWith('/ws')
409-
? serviceProtocolUrl.path
410-
: (serviceProtocolUrl.path.endsWith('/')
411-
? '${serviceProtocolUrl.path}ws'
412-
: '${serviceProtocolUrl.path}/ws');
407+
final path = serviceProtocolUrl.path.endsWith('/ws')
408+
? serviceProtocolUrl.path
409+
: (serviceProtocolUrl.path.endsWith('/')
410+
? '${serviceProtocolUrl.path}ws'
411+
: '${serviceProtocolUrl.path}/ws');
413412

414413
return serviceProtocolUrl.replace(scheme: scheme, path: path);
415414
}

packages/devtools_app/integration_test/test_infra/run/run_test.dart

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,10 @@ Future<void> runFlutterIntegrationTest(
8989
class DevToolsAppTestRunnerArgs extends IntegrationTestRunnerArgs {
9090
DevToolsAppTestRunnerArgs(super.args, {super.verifyValidTarget = true})
9191
: super(addExtraArgs: _addExtraArgs) {
92-
testAppDevice =
93-
TestAppDevice.fromArgName(
94-
argResults.option(_testAppDeviceArg) ??
95-
TestAppDevice.flutterTester.argName,
96-
)!;
92+
testAppDevice = TestAppDevice.fromArgName(
93+
argResults.option(_testAppDeviceArg) ??
94+
TestAppDevice.flutterTester.argName,
95+
)!;
9796
}
9897

9998
/// The type of device for the test app to run on.

0 commit comments

Comments
 (0)