Skip to content

Commit c1c7898

Browse files
authored
Bump dependencies in Flutter (#147546)
1 parent b176bce commit c1c7898

File tree

29 files changed

+88
-94
lines changed

29 files changed

+88
-94
lines changed

dev/benchmarks/multiple_flutters/module/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies:
3636
term_glyph: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3737
typed_data: 1.3.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3838
vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
39-
win32: 5.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
39+
win32: 5.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4040
xdg_directories: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4141

4242
flutter:
@@ -47,4 +47,4 @@ flutter:
4747
androidPackage: com.example.multiple_flutters_module
4848
iosBundleIdentifier: com.example.multipleFluttersModule
4949

50-
# PUBSPEC CHECKSUM: e6e1
50+
# PUBSPEC CHECKSUM: 18e2

dev/bots/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dependencies:
3838
http_multi_server: 3.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3939
io: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4040
js: 0.7.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
41-
json_annotation: 4.8.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
41+
json_annotation: 4.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4242
logging: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4343
matcher: 0.12.16+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4444
metrics_center: 1.0.13 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -75,4 +75,4 @@ dependencies:
7575
dev_dependencies:
7676
test_api: 0.7.1
7777

78-
# PUBSPEC CHECKSUM: df09
78+
# PUBSPEC CHECKSUM: e309

dev/devicelab/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ dependencies:
3636
googleapis: 12.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3737
googleapis_auth: 1.3.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
3838
http_parser: 4.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
39-
json_annotation: 4.8.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
39+
json_annotation: 4.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4040
mime: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4141
petitparser: 6.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4242
pub_semver: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -73,4 +73,4 @@ dev_dependencies:
7373
watcher: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7474
web_socket_channel: 2.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7575

76-
# PUBSPEC CHECKSUM: 8376
76+
# PUBSPEC CHECKSUM: 8776

dev/integration_tests/android_views/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dependencies:
4747
vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4848
vm_service: 14.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4949
webdriver: 3.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
50-
win32: 5.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
50+
win32: 5.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
5151
xdg_directories: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
5252

5353
dev_dependencies:
@@ -95,4 +95,4 @@ dev_dependencies:
9595
flutter:
9696
uses-material-design: true
9797

98-
# PUBSPEC CHECKSUM: 1e59
98+
# PUBSPEC CHECKSUM: 655a

dev/integration_tests/gradle_deprecated_settings/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
camera: 0.10.5+9
1111
camera_android: 0.10.8+17
1212

13-
camera_avfoundation: 0.9.15+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
13+
camera_avfoundation: 0.9.16 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1414
camera_platform_interface: 2.7.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1515
camera_web: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
1616
characters: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -27,4 +27,4 @@ dependencies:
2727
flutter:
2828
uses-material-design: true
2929

30-
# PUBSPEC CHECKSUM: b799
30+
# PUBSPEC CHECKSUM: 223b

dev/integration_tests/hybrid_android_views/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies:
4545
vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4646
vm_service: 14.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4747
webdriver: 3.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
48-
win32: 5.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
48+
win32: 5.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
4949
xdg_directories: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
5050

5151
dev_dependencies:
@@ -93,4 +93,4 @@ dev_dependencies:
9393
flutter:
9494
uses-material-design: true
9595

96-
# PUBSPEC CHECKSUM: 1e59
96+
# PUBSPEC CHECKSUM: 655a

dev/integration_tests/new_gallery/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ dependencies:
6060
url_launcher_web: 2.3.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6161
url_launcher_windows: 3.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6262
web: 0.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
63-
win32: 5.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
63+
win32: 5.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6464
xdg_directories: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
6565

6666
dev_dependencies:
@@ -312,4 +312,4 @@ flutter:
312312
fonts:
313313
- asset: packages/flutter_gallery_assets/fonts/GalleryIcons.ttf
314314

315-
# PUBSPEC CHECKSUM: fd6d
315+
# PUBSPEC CHECKSUM: 456e

packages/flutter_tools/lib/src/isolated/devfs_web.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ class WebAssetServer implements AssetReader {
292292
},
293293
toolConfiguration: ToolConfiguration(
294294
loadStrategy: ddcModuleSystem
295-
? FrontendServerLegacyStrategyProvider(
295+
? FrontendServerDdcStrategyProvider(
296296
ReloadConfiguration.none,
297297
server,
298298
PackageUriMapper(packageConfig),

packages/flutter_tools/lib/src/update_packages_pins.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,5 @@ const Map<String, String> kManuallyPinnedDependencies = <String, String>{
3030
'path_provider_android':
3131
'2.2.1', // https://github.com/flutter/flutter/issues/140796
3232
'camera_android': '0.10.8+17', // https://github.com/flutter/flutter/issues/146004
33+
'dds': '4.1.0', // https://github.com/dart-lang/sdk/issues/55559
3334
};

packages/flutter_tools/pubspec.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ dependencies:
1313
archive: 3.3.2
1414
args: 2.5.0
1515
browser_launcher: 1.1.1
16-
dds: 3.4.0
17-
dwds: 23.3.0
16+
dds: 4.1.0
17+
dwds: 24.0.0
1818
completion: 1.0.1
1919
coverage: 1.7.2
2020
crypto: 3.0.3
@@ -52,7 +52,7 @@ dependencies:
5252
http_multi_server: 3.2.1
5353
convert: 3.1.1
5454
async: 2.11.0
55-
unified_analytics: 5.8.8+1
55+
unified_analytics: 6.1.0
5656

5757
cli_config: 0.2.0
5858
graphs: 2.3.1
@@ -77,9 +77,9 @@ dependencies:
7777
clock: 1.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7878
csslib: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
7979
dap: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
80-
dds_service_extensions: 1.7.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
81-
devtools_shared: 8.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
82-
dtd: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
80+
dds_service_extensions: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
81+
devtools_shared: 9.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
82+
dtd: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
8383
extension_discovery: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
8484
fixnum: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
8585
frontend_server_client: 4.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -100,7 +100,7 @@ dependencies:
100100
sync_http: 0.3.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
101101
term_glyph: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
102102
typed_data: 1.3.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
103-
vm_service_interface: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
103+
vm_service_interface: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
104104
watcher: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
105105
web: 0.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
106106
yaml_edit: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -112,12 +112,12 @@ dev_dependencies:
112112

113113
checked_yaml: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
114114
js: 0.7.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
115-
json_annotation: 4.8.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
115+
json_annotation: 4.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
116116
node_preamble: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
117117
test: 1.25.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
118118

119119
dartdoc:
120120
# Exclude this package from the hosted API docs.
121121
nodoc: true
122122

123-
# PUBSPEC CHECKSUM: 1789
123+
# PUBSPEC CHECKSUM: c116

packages/flutter_tools/test/commands.shard/hermetic/build_ios_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ final Platform notMacosPlatform = FakePlatform(
7070
);
7171

7272
void main() {
73-
late FileSystem fileSystem;
73+
late MemoryFileSystem fileSystem;
7474
late TestUsage usage;
7575
late FakeAnalytics fakeAnalytics;
7676
late BufferLogger logger;

packages/flutter_tools/test/commands.shard/hermetic/build_ipa_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class FakePlistUtils extends Fake implements PlistParser {
7272
}
7373

7474
void main() {
75-
late FileSystem fileSystem;
75+
late MemoryFileSystem fileSystem;
7676
late TestUsage usage;
7777
late FakeProcessManager fakeProcessManager;
7878
late ProcessUtils processUtils;

packages/flutter_tools/test/commands.shard/hermetic/build_macos_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ final Platform notMacosPlatform = FakePlatform(
6464
);
6565

6666
void main() {
67-
late FileSystem fileSystem;
67+
late MemoryFileSystem fileSystem;
6868
late TestUsage usage;
6969
late FakeProcessManager fakeProcessManager;
7070
late ProcessUtils processUtils;

packages/flutter_tools/test/commands.shard/hermetic/build_windows_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ final Platform notWindowsPlatform = FakePlatform(
4545
);
4646

4747
void main() {
48-
late FileSystem fileSystem;
48+
late MemoryFileSystem fileSystem;
4949
late ProcessManager processManager;
5050
late TestUsage usage;
5151
late FakeAnalytics fakeAnalytics;

packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void main() {
4646
late BufferLogger logger;
4747
late TestUsage testUsage;
4848
late FakeAnalytics fakeAnalytics;
49-
late FileSystem fileSystem;
49+
late MemoryFileSystem fileSystem;
5050
late FakeProcessManager processManager;
5151

5252
setUp(() {

packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import '../../src/common.dart';
1515
import '../../src/fakes.dart';
1616

1717
void main() {
18-
late FileSystem fileSystem;
18+
late MemoryFileSystem fileSystem;
1919
late FakeAnalytics fakeAnalytics;
2020

2121
setUp(() {

packages/flutter_tools/test/general.shard/build_system/targets/ios_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const List<String> _kSharedConfig = <String>[
4242

4343
void main() {
4444
late Environment environment;
45-
late FileSystem fileSystem;
45+
late MemoryFileSystem fileSystem;
4646
late FakeProcessManager processManager;
4747
late Artifacts artifacts;
4848
late BufferLogger logger;

packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import '../../../src/fakes.dart';
2121

2222
void main() {
2323
late Environment environment;
24-
late FileSystem fileSystem;
24+
late MemoryFileSystem fileSystem;
2525
late Artifacts artifacts;
2626
late FakeProcessManager processManager;
2727
late File binary;

packages/flutter_tools/test/general.shard/hot_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void main() {
109109

110110
group('hotRestart', () {
111111
final FakeResidentCompiler residentCompiler = FakeResidentCompiler();
112-
late FileSystem fileSystem;
112+
late MemoryFileSystem fileSystem;
113113
late TestUsage testUsage;
114114
late FakeAnalytics fakeAnalytics;
115115

@@ -534,7 +534,7 @@ void main() {
534534
});
535535

536536
group('hot attach', () {
537-
late FileSystem fileSystem;
537+
late MemoryFileSystem fileSystem;
538538
late FakeAnalytics fakeAnalytics;
539539

540540
setUp(() {
@@ -578,7 +578,7 @@ void main() {
578578
});
579579

580580
group('hot cleanupAtFinish()', () {
581-
late FileSystem fileSystem;
581+
late MemoryFileSystem fileSystem;
582582
late FakeAnalytics fakeAnalytics;
583583

584584
setUp(() {

packages/flutter_tools/test/general.shard/isolated/hot_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import 'fake_native_assets_build_runner.dart';
2727
void main() {
2828
group('native assets', () {
2929
late TestHotRunnerConfig testingConfig;
30-
late FileSystem fileSystem;
30+
late MemoryFileSystem fileSystem;
3131
late FakeAnalytics fakeAnalytics;
3232

3333
setUp(() {

packages/flutter_tools/test/general.shard/isolated/resident_runner_test.dart

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
65
import 'package:flutter_tools/src/build_info.dart';
76
import 'package:flutter_tools/src/device.dart';
87
import 'package:flutter_tools/src/features.dart';
98
import 'package:flutter_tools/src/globals.dart' as globals;
109
import 'package:flutter_tools/src/resident_devtools_handler.dart';
1110
import 'package:flutter_tools/src/resident_runner.dart';
1211
import 'package:flutter_tools/src/run_hot.dart';
12+
import 'package:test/fake.dart';
1313
import 'package:unified_analytics/unified_analytics.dart';
1414

15-
import '../../src/common.dart';
1615
import '../../src/context.dart';
1716
import '../../src/fake_vm_services.dart';
1817
import '../../src/fakes.dart';
@@ -22,43 +21,18 @@ import 'fake_native_assets_build_runner.dart';
2221

2322
void main() {
2423
late Testbed testbed;
25-
late FakeFlutterDevice flutterDevice;
2624
late FakeDevFS devFS;
27-
late ResidentRunner residentRunner;
28-
late FakeDevice device;
29-
late FakeAnalytics fakeAnalytics;
3025
FakeVmServiceHost? fakeVmServiceHost;
3126

3227
setUp(() {
3328
testbed = Testbed(setup: () {
34-
fakeAnalytics = getInitializedFakeAnalyticsInstance(
35-
fs: globals.fs,
36-
fakeFlutterVersion: FakeFlutterVersion(),
37-
);
38-
3929
globals.fs.file('.packages')
4030
.writeAsStringSync('\n');
4131
globals.fs.file(globals.fs.path.join('build', 'app.dill'))
4232
..createSync(recursive: true)
4333
..writeAsStringSync('ABC');
44-
residentRunner = HotRunner(
45-
<FlutterDevice>[
46-
flutterDevice,
47-
],
48-
stayResident: false,
49-
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
50-
target: 'main.dart',
51-
devtoolsHandler: createNoOpHandler,
52-
analytics: fakeAnalytics,
53-
);
5434
});
55-
device = FakeDevice();
5635
devFS = FakeDevFS();
57-
flutterDevice = FakeFlutterDevice()
58-
..testUri = testUri
59-
..vmServiceHost = (() => fakeVmServiceHost)
60-
..device = device
61-
..fakeDevFS = devFS;
6236
});
6337

6438
testUsingContext(
@@ -85,7 +59,7 @@ void main() {
8559
.file(globals.fs.path.join('lib', 'main.dart'))
8660
.createSync(recursive: true);
8761
final FakeNativeAssetsBuildRunner buildRunner = FakeNativeAssetsBuildRunner();
88-
residentRunner = HotRunner(
62+
final HotRunner residentRunner = HotRunner(
8963
<FlutterDevice>[
9064
flutterDevice,
9165
],
@@ -99,11 +73,11 @@ void main() {
9973
target: 'main.dart',
10074
devtoolsHandler: createNoOpHandler,
10175
nativeAssetsBuilder: FakeHotRunnerNativeAssetsBuilder(buildRunner),
102-
analytics: fakeAnalytics,
76+
analytics: FakeAnalytics(),
10377
nativeAssetsYamlFile: 'foo.yaml',
10478
);
10579

106-
final int? result = await residentRunner.run();
80+
final int result = await residentRunner.run();
10781
expect(result, 0);
10882

10983
expect(buildRunner.buildInvocations, 0);
@@ -119,3 +93,10 @@ void main() {
11993
FeatureFlags: () => TestFeatureFlags(isNativeAssetsEnabled: true, isMacOSEnabled: true),
12094
});
12195
}
96+
97+
class FakeAnalytics extends Fake implements Analytics {
98+
@override
99+
void send(Event event) => sentEvents.add(event);
100+
101+
final List<Event> sentEvents = <Event>[];
102+
}

packages/flutter_tools/test/general.shard/macos/cocoapods_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ enum _StdioStream {
2929
}
3030

3131
void main() {
32-
late FileSystem fileSystem;
32+
late MemoryFileSystem fileSystem;
3333
late FakeProcessManager fakeProcessManager;
3434
late CocoaPods cocoaPodsUnderTest;
3535
late BufferLogger logger;

0 commit comments

Comments
 (0)