Bump dependencies in Flutter (#147546)

dev/benchmarks/multiple_flutters/module/pubspec.yaml

@@ -36,7 +36,7 @@ dependencies:
   term_glyph: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   typed_data: 1.3.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  win32: 5.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  win32: 5.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   xdg_directories: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
 flutter:
@@ -47,4 +47,4 @@ flutter:
     androidPackage: com.example.multiple_flutters_module
     iosBundleIdentifier: com.example.multipleFluttersModule
 
-# PUBSPEC CHECKSUM: e6e1
+# PUBSPEC CHECKSUM: 18e2

dev/bots/pubspec.yaml

@@ -38,7 +38,7 @@ dependencies:
   http_multi_server: 3.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   io: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.7.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  json_annotation: 4.8.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  json_annotation: 4.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.16+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   metrics_center: 1.0.13 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -75,4 +75,4 @@ dependencies:
 dev_dependencies:
   test_api: 0.7.1
 
-# PUBSPEC CHECKSUM: df09
+# PUBSPEC CHECKSUM: e309

dev/devicelab/pubspec.yaml

@@ -36,7 +36,7 @@ dependencies:
   googleapis: 12.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   googleapis_auth: 1.3.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http_parser: 4.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  json_annotation: 4.8.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  json_annotation: 4.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   mime: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   petitparser: 6.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   pub_semver: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -73,4 +73,4 @@ dev_dependencies:
   watcher: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   web_socket_channel: 2.4.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
-# PUBSPEC CHECKSUM: 8376
+# PUBSPEC CHECKSUM: 8776

dev/integration_tests/android_views/pubspec.yaml

@@ -47,7 +47,7 @@ dependencies:
   vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   vm_service: 14.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   webdriver: 3.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  win32: 5.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  win32: 5.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   xdg_directories: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
 dev_dependencies:
@@ -95,4 +95,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 1e59
+# PUBSPEC CHECKSUM: 655a

dev/integration_tests/gradle_deprecated_settings/pubspec.yaml

@@ -10,7 +10,7 @@ dependencies:
   camera: 0.10.5+9
   camera_android: 0.10.8+17
 
-  camera_avfoundation: 0.9.15+4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  camera_avfoundation: 0.9.16 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   camera_platform_interface: 2.7.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   camera_web: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   characters: 1.3.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -27,4 +27,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: b799
+# PUBSPEC CHECKSUM: 223b

dev/integration_tests/hybrid_android_views/pubspec.yaml

@@ -45,7 +45,7 @@ dependencies:
   vector_math: 2.1.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   vm_service: 14.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   webdriver: 3.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  win32: 5.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  win32: 5.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   xdg_directories: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
 dev_dependencies:
@@ -93,4 +93,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 1e59
+# PUBSPEC CHECKSUM: 655a

dev/integration_tests/new_gallery/pubspec.yaml

@@ -60,7 +60,7 @@ dependencies:
   url_launcher_web: 2.3.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   url_launcher_windows: 3.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   web: 0.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  win32: 5.4.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  win32: 5.5.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   xdg_directories: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
 dev_dependencies:
@@ -312,4 +312,4 @@ flutter:
       fonts:
         - asset: packages/flutter_gallery_assets/fonts/GalleryIcons.ttf
 
-# PUBSPEC CHECKSUM: fd6d
+# PUBSPEC CHECKSUM: 456e

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

@@ -292,7 +292,7 @@ class WebAssetServer implements AssetReader {
       },
       toolConfiguration: ToolConfiguration(
         loadStrategy: ddcModuleSystem
-            ? FrontendServerLegacyStrategyProvider(
+            ? FrontendServerDdcStrategyProvider(
         ReloadConfiguration.none,
         server,
         PackageUriMapper(packageConfig),

packages/flutter_tools/lib/src/update_packages_pins.dart

@@ -30,4 +30,5 @@ const Map<String, String> kManuallyPinnedDependencies = <String, String>{
   'path_provider_android':
       '2.2.1', // https://github.com/flutter/flutter/issues/140796
   'camera_android': '0.10.8+17', // https://github.com/flutter/flutter/issues/146004
+  'dds': '4.1.0', // https://github.com/dart-lang/sdk/issues/55559
 };

packages/flutter_tools/pubspec.yaml

@@ -13,8 +13,8 @@ dependencies:
   archive: 3.3.2
   args: 2.5.0
   browser_launcher: 1.1.1
-  dds: 3.4.0
+  dds: 4.1.0
-  dwds: 23.3.0
+  dwds: 24.0.0
   completion: 1.0.1
   coverage: 1.7.2
   crypto: 3.0.3
@@ -52,7 +52,7 @@ dependencies:
   http_multi_server: 3.2.1
   convert: 3.1.1
   async: 2.11.0
-  unified_analytics: 5.8.8+1
+  unified_analytics: 6.1.0
 
   cli_config: 0.2.0
   graphs: 2.3.1
@@ -77,9 +77,9 @@ dependencies:
   clock: 1.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 1.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   dap: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  dds_service_extensions: 1.7.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  dds_service_extensions: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  devtools_shared: 8.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  devtools_shared: 9.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  dtd: 2.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  dtd: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   extension_discovery: 2.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   fixnum: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   frontend_server_client: 4.0.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -100,7 +100,7 @@ dependencies:
   sync_http: 0.3.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   term_glyph: 1.2.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   typed_data: 1.3.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  vm_service_interface: 1.0.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  vm_service_interface: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   watcher: 1.1.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   web: 0.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   yaml_edit: 2.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -112,7 +112,7 @@ dev_dependencies:
 
   checked_yaml: 2.0.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.7.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  json_annotation: 4.8.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  json_annotation: 4.9.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   node_preamble: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   test: 1.25.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
@@ -120,4 +120,4 @@ dartdoc:
   # Exclude this package from the hosted API docs.
   nodoc: true
 
-# PUBSPEC CHECKSUM: 1789
+# PUBSPEC CHECKSUM: c116

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

@@ -70,7 +70,7 @@ final Platform notMacosPlatform = FakePlatform(
 );
 
 void main() {
-  late FileSystem fileSystem;
+  late MemoryFileSystem fileSystem;
   late TestUsage usage;
   late FakeAnalytics fakeAnalytics;
   late BufferLogger logger;

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

@@ -72,7 +72,7 @@ class FakePlistUtils extends Fake implements PlistParser {
 }
 
 void main() {
-  late FileSystem fileSystem;
+  late MemoryFileSystem fileSystem;
   late TestUsage usage;
   late FakeProcessManager fakeProcessManager;
   late ProcessUtils processUtils;

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

@@ -64,7 +64,7 @@ final Platform notMacosPlatform = FakePlatform(
 );
 
 void main() {
-  late FileSystem fileSystem;
+  late MemoryFileSystem fileSystem;
   late TestUsage usage;
   late FakeProcessManager fakeProcessManager;
   late ProcessUtils processUtils;

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

@@ -45,7 +45,7 @@ final Platform notWindowsPlatform = FakePlatform(
 );
 
 void main() {
-  late FileSystem fileSystem;
+  late MemoryFileSystem fileSystem;
   late ProcessManager processManager;
   late TestUsage usage;
   late FakeAnalytics fakeAnalytics;

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

@@ -46,7 +46,7 @@ void main() {
     late BufferLogger logger;
     late TestUsage testUsage;
     late FakeAnalytics fakeAnalytics;
-    late FileSystem fileSystem;
+    late MemoryFileSystem fileSystem;
     late FakeProcessManager processManager;
 
     setUp(() {

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

@@ -15,7 +15,7 @@ import '../../src/common.dart';
 import '../../src/fakes.dart';
 
 void main() {
-  late FileSystem fileSystem;
+  late MemoryFileSystem fileSystem;
   late FakeAnalytics fakeAnalytics;
 
   setUp(() {

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

@@ -42,7 +42,7 @@ const List<String> _kSharedConfig = <String>[
 
 void main() {
   late Environment environment;
-  late FileSystem fileSystem;
+  late MemoryFileSystem fileSystem;
   late FakeProcessManager processManager;
   late Artifacts artifacts;
   late BufferLogger logger;

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

@@ -21,7 +21,7 @@ import '../../../src/fakes.dart';
 
 void main() {
   late Environment environment;
-  late FileSystem fileSystem;
+  late MemoryFileSystem fileSystem;
   late Artifacts artifacts;
   late FakeProcessManager processManager;
   late File binary;

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

@@ -109,7 +109,7 @@ void main() {
 
   group('hotRestart', () {
     final FakeResidentCompiler residentCompiler = FakeResidentCompiler();
-    late FileSystem fileSystem;
+    late MemoryFileSystem fileSystem;
     late TestUsage testUsage;
     late FakeAnalytics fakeAnalytics;
 
@@ -534,7 +534,7 @@ void main() {
   });
 
   group('hot attach', () {
-    late FileSystem fileSystem;
+    late MemoryFileSystem fileSystem;
     late FakeAnalytics fakeAnalytics;
 
     setUp(() {
@@ -578,7 +578,7 @@ void main() {
   });
 
   group('hot cleanupAtFinish()', () {
-    late FileSystem fileSystem;
+    late MemoryFileSystem fileSystem;
     late FakeAnalytics fakeAnalytics;
 
     setUp(() {

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

@@ -27,7 +27,7 @@ import 'fake_native_assets_build_runner.dart';
 void main() {
   group('native assets', () {
     late TestHotRunnerConfig testingConfig;
-    late FileSystem fileSystem;
+    late MemoryFileSystem fileSystem;
     late FakeAnalytics fakeAnalytics;
 
     setUp(() {

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

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-
 import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/features.dart';
@@ -10,9 +9,9 @@ import 'package:flutter_tools/src/globals.dart' as globals;
 import 'package:flutter_tools/src/resident_devtools_handler.dart';
 import 'package:flutter_tools/src/resident_runner.dart';
 import 'package:flutter_tools/src/run_hot.dart';
+import 'package:test/fake.dart';
 import 'package:unified_analytics/unified_analytics.dart';
 
-import '../../src/common.dart';
 import '../../src/context.dart';
 import '../../src/fake_vm_services.dart';
 import '../../src/fakes.dart';
@@ -22,43 +21,18 @@ import 'fake_native_assets_build_runner.dart';
 
 void main() {
   late Testbed testbed;
-  late FakeFlutterDevice flutterDevice;
   late FakeDevFS devFS;
-  late ResidentRunner residentRunner;
-  late FakeDevice device;
-  late FakeAnalytics fakeAnalytics;
   FakeVmServiceHost? fakeVmServiceHost;
 
   setUp(() {
     testbed = Testbed(setup: () {
-      fakeAnalytics = getInitializedFakeAnalyticsInstance(
-        fs: globals.fs,
-        fakeFlutterVersion: FakeFlutterVersion(),
-      );
-
       globals.fs.file('.packages')
         .writeAsStringSync('\n');
       globals.fs.file(globals.fs.path.join('build', 'app.dill'))
         ..createSync(recursive: true)
         ..writeAsStringSync('ABC');
-      residentRunner = HotRunner(
-        <FlutterDevice>[
-          flutterDevice,
-        ],
-        stayResident: false,
-        debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
-        target: 'main.dart',
-        devtoolsHandler: createNoOpHandler,
-        analytics: fakeAnalytics,
-      );
     });
-    device = FakeDevice();
     devFS = FakeDevFS();
-    flutterDevice = FakeFlutterDevice()
-      ..testUri = testUri
-      ..vmServiceHost = (() => fakeVmServiceHost)
-      ..device = device
-      ..fakeDevFS = devFS;
   });
 
   testUsingContext(
@@ -85,7 +59,7 @@ void main() {
             .file(globals.fs.path.join('lib', 'main.dart'))
             .createSync(recursive: true);
         final FakeNativeAssetsBuildRunner buildRunner = FakeNativeAssetsBuildRunner();
-        residentRunner = HotRunner(
+        final HotRunner residentRunner = HotRunner(
           <FlutterDevice>[
             flutterDevice,
           ],
@@ -99,11 +73,11 @@ void main() {
           target: 'main.dart',
           devtoolsHandler: createNoOpHandler,
           nativeAssetsBuilder: FakeHotRunnerNativeAssetsBuilder(buildRunner),
-          analytics: fakeAnalytics,
+          analytics: FakeAnalytics(),
           nativeAssetsYamlFile: 'foo.yaml',
         );
 
-        final int? result = await residentRunner.run();
+        final int result = await residentRunner.run();
         expect(result, 0);
 
         expect(buildRunner.buildInvocations, 0);
@@ -119,3 +93,10 @@ void main() {
         FeatureFlags: () => TestFeatureFlags(isNativeAssetsEnabled: true, isMacOSEnabled: true),
       });
 }
+
+class FakeAnalytics extends Fake implements Analytics {
+  @override
+  void send(Event event) => sentEvents.add(event);
+
+  final List<Event> sentEvents = <Event>[];
+}

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

@@ -29,7 +29,7 @@ enum _StdioStream {
 }
 
 void main() {
-  late FileSystem fileSystem;
+  late MemoryFileSystem fileSystem;
   late FakeProcessManager fakeProcessManager;
   late CocoaPods cocoaPodsUnderTest;
   late BufferLogger logger;

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

@@ -172,6 +172,12 @@ class FakeDartDevelopmentServiceException implements dds.DartDevelopmentServiceE
   @override
   final String message;
   static const String defaultMessage = 'A DDS instance is already connected at http://localhost:8181';
+
+  @override
+  Map<String, Object?> toJson() => <String, Object?>{
+        'error_code': errorCode,
+        'message': message,
+      };
 }
 
 class TestFlutterDevice extends FlutterDevice {

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

@@ -30,7 +30,7 @@ import 'package:flutter_tools/src/run_cold.dart';
 import 'package:flutter_tools/src/run_hot.dart';
 import 'package:flutter_tools/src/version.dart';
 import 'package:flutter_tools/src/vmservice.dart';
-import 'package:unified_analytics/testing.dart';
+import 'package:test/fake.dart';
 import 'package:unified_analytics/unified_analytics.dart';
 import 'package:vm_service/vm_service.dart' as vm_service;
 
@@ -41,22 +41,18 @@ import '../src/fakes.dart';
 import '../src/testbed.dart';
 import 'resident_runner_helpers.dart';
 
+FakeAnalytics get fakeAnalytics => globals.analytics as FakeAnalytics;
+
 void main() {
   late Testbed testbed;
   late FakeFlutterDevice flutterDevice;
   late FakeDevFS devFS;
   late ResidentRunner residentRunner;
   late FakeDevice device;
-  late FakeAnalytics fakeAnalytics;
   FakeVmServiceHost? fakeVmServiceHost;
 
   setUp(() {
     testbed = Testbed(setup: () {
-      fakeAnalytics = getInitializedFakeAnalyticsInstance(
-        fs: globals.fs,
-        fakeFlutterVersion: FakeFlutterVersion(),
-      );
-
       globals.fs.file('.packages')
         .writeAsStringSync('\n');
       globals.fs.file(globals.fs.path.join('build', 'app.dill'))
@@ -70,8 +66,10 @@ void main() {
         debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
         target: 'main.dart',
         devtoolsHandler: createNoOpHandler,
-        analytics: fakeAnalytics,
+        analytics: globals.analytics,
       );
+    }, overrides: <Type, Generator>{
+      Analytics: () => FakeAnalytics(),
     });
     device = FakeDevice();
     devFS = FakeDevFS();
@@ -120,7 +118,7 @@ void main() {
       debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
       target: 'main.dart',
       devtoolsHandler: createNoOpHandler,
-      analytics: fakeAnalytics,
+      analytics: globals.analytics,
     );
     flutterDevice.generator = residentCompiler;
 
@@ -144,7 +142,7 @@ void main() {
       debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
       target: 'main.dart',
       devtoolsHandler: createNoOpHandler,
-      analytics: fakeAnalytics,
+      analytics: globals.analytics,
     );
     flutterDevice.generator = residentCompiler;
 
@@ -214,7 +212,7 @@ void main() {
       debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
       target: 'main.dart',
       devtoolsHandler: createNoOpHandler,
-      analytics: fakeAnalytics,
+      analytics: globals.analytics,
     );
     flutterDevice.generator = residentCompiler;
 
@@ -274,7 +272,7 @@ void main() {
       ),
       target: 'main.dart',
       devtoolsHandler: createNoOpHandler,
-      analytics: fakeAnalytics,
+      analytics: globals.analytics,
     );
     final Completer<DebugConnectionInfo> futureConnectionInfo = Completer<DebugConnectionInfo>.sync();
     final Completer<void> futureAppStart = Completer<void>.sync();
@@ -319,7 +317,7 @@ void main() {
         hotEventFullRestart: false,
       )),
     ));
-    expect(fakeAnalytics.sentEvents, contains(
+    expect((globals.analytics as FakeAnalytics).sentEvents, contains(
       Event.hotRunnerInfo(
         label: 'exception',
         targetPlatform: getNameForTargetPlatform(TargetPlatform.android_arm),
@@ -863,7 +861,7 @@ void main() {
 
     // Parse out the event of interest since we may have timing events with
     // the new analytics package
-    final List<Event> newEventList = fakeAnalytics.sentEvents.where((Event e) => e.eventName == DashEvent.hotRunnerInfo).toList();
+    final List<Event> newEventList = fakeAnalytics.sentEvents.where((Event e) => e.eventName.label == 'hot_runner_info').toList();
     expect(newEventList, hasLength(1));
     final Event newEvent = newEventList.first;
     expect(newEvent.eventName.label, 'hot_runner_info');
@@ -2373,7 +2371,7 @@ flutter:
           )),
           target: 'main.dart',
           devtoolsHandler: createNoOpHandler,
-          analytics: fakeAnalytics,
+          analytics: globals.analytics,
           nativeAssetsYamlFile: 'foo.yaml',
         );
 
@@ -2388,3 +2386,10 @@ flutter:
         FeatureFlags: () => TestFeatureFlags(isNativeAssetsEnabled: true, isMacOSEnabled: true),
       });
 }
+
+class FakeAnalytics extends Fake implements Analytics {
+  @override
+  void send(Event event) => sentEvents.add(event);
+
+  final List<Event> sentEvents = <Event>[];
+}

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

@@ -29,7 +29,7 @@ import '../src/test_build_system.dart';
 void main() {
   late FakeFlutterDevice mockFlutterDevice;
   late FakeWebDevFS mockWebDevFS;
-  late FileSystem fileSystem;
+  late MemoryFileSystem fileSystem;
 
   setUp(() {
     fileSystem = MemoryFileSystem.test();

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

@@ -102,7 +102,7 @@ void main() {
   late FakeWebServerDevice webServerDevice;
   late FakeDevice mockDevice;
   late FakeVmServiceHost fakeVmServiceHost;
-  late FileSystem fileSystem;
+  late MemoryFileSystem fileSystem;
   late ProcessManager processManager;
   late TestUsage testUsage;
   late FakeAnalytics fakeAnalytics;

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

@@ -4,7 +4,6 @@
 
 import 'package:file/memory.dart';
 import 'package:flutter_tools/src/base/config.dart';
-import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/reporting/unified_analytics.dart';
 import 'package:unified_analytics/unified_analytics.dart';
 
@@ -15,7 +14,7 @@ void main() {
   const String userBranch = 'abc123';
   const String clientIde = 'VSCode';
 
-  late FileSystem fs;
+  late MemoryFileSystem fs;
   late Config config;
   late FakeAnalytics analyticsOverride;
 

packages/flutter_tools/test/integration.shard/debug_adapter/test_client.dart

@@ -67,6 +67,13 @@ class DapTestClient {
   /// Returns a stream of the string output from [OutputEventBody] events with the category 'stdout'.
   Stream<String> get stdoutOutput => outputEvents
       .where((OutputEventBody output) => output.category == 'stdout')
+        // Skip empty output events. These are pointless (but harmless) events
+        // that started occurring with pkg:dds 4.2.0 because of how the stack
+        // trace parsing is done. This will be unnecessary once fixed in
+        // DDS/DAP.
+        // TODO(dantup): Remove this once we're updated to a version of DAP that
+        //  includes https://dart-review.googlesource.com/c/sdk/+/364340.
+      .where((OutputEventBody output) => output.output.isNotEmpty)
       .map((OutputEventBody output) => output.output);
 
   /// Sends a custom request to the server and waits for a response.

packages/flutter_tools/test/src/common.dart

@@ -17,7 +17,6 @@ import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path; // flutter_ignore: package_path_import
 import 'package:test/test.dart' as test_package show test;
 import 'package:test/test.dart' hide test;
-import 'package:unified_analytics/testing.dart';
 import 'package:unified_analytics/unified_analytics.dart';
 
 import 'fakes.dart';
@@ -319,31 +318,27 @@ class FileExceptionHandler {
 /// instance, then a second instance will be generated and returned. This second
 /// instance will be cleared to send events.
 FakeAnalytics getInitializedFakeAnalyticsInstance({
-  required FileSystem fs,
+  required MemoryFileSystem fs,
   required FakeFlutterVersion fakeFlutterVersion,
   String? clientIde,
   String? enabledFeatures,
 }) {
   final Directory homeDirectory = fs.directory('/');
-  final FakeAnalytics initialAnalytics = FakeAnalytics(
+  final FakeAnalytics initialAnalytics = Analytics.fake(
     tool: DashTool.flutterTool,
     homeDirectory: homeDirectory,
     dartVersion: fakeFlutterVersion.dartSdkVersion,
-    platform: DevicePlatform.linux,
     fs: fs,
-    surveyHandler: SurveyHandler(homeDirectory: homeDirectory, fs: fs),
     flutterChannel: fakeFlutterVersion.channel,
     flutterVersion: fakeFlutterVersion.getVersionString(),
   );
   initialAnalytics.clientShowedMessage();
 
-  return FakeAnalytics(
+  return Analytics.fake(
     tool: DashTool.flutterTool,
     homeDirectory: homeDirectory,
     dartVersion: fakeFlutterVersion.dartSdkVersion,
-    platform: DevicePlatform.linux,
     fs: fs,
-    surveyHandler: SurveyHandler(homeDirectory: homeDirectory, fs: fs),
     flutterChannel: fakeFlutterVersion.channel,
     flutterVersion: fakeFlutterVersion.getVersionString(),
     clientIde: clientIde,