Revert "Migrate xcdevice and ios devices to null safety (#91704)" (#91912)

This reverts commit 00658736.

packages/flutter_tools/lib/src/artifacts.dart

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:file/memory.dart';
+import 'package:meta/meta.dart';
 import 'package:process/process.dart';
 
 import 'base/common.dart';
@@ -281,6 +282,7 @@ abstract class Artifacts {
   /// If a [fileSystem] is not provided, creates a new [MemoryFileSystem] instance.
   ///
   /// Creates a [LocalEngineArtifacts] if `localEngine` is non-null
+  @visibleForTesting
   factory Artifacts.test({String? localEngine, FileSystem? fileSystem}) {
     fileSystem ??= MemoryFileSystem.test();
     if (localEngine != null) {

packages/flutter_tools/lib/src/cache.dart

@@ -127,6 +127,7 @@ class Cache {
   /// Defaults to a memory file system, fake platform,
   /// buffer logger, and no accessible artifacts.
   /// By default, the root cache directory path is "cache".
+  @visibleForTesting
   factory Cache.test({
     Directory? rootOverride,
     List<ArtifactSet>? artifacts,

packages/flutter_tools/lib/src/device.dart

@@ -468,7 +468,7 @@ abstract class Device {
   /// The ID returned matches that in the output of `flutter emulators`. Fetching
   /// this name may require connecting to the device and if an error occurs null
   /// will be returned.
-  Future<String?> get emulatorId;
+  Future<String> get emulatorId;
 
   /// Whether this device can run the provided [buildMode].
   ///
@@ -550,7 +550,7 @@ abstract class Device {
   /// reader will also include log messages from before the invocation time.
   /// Defaults to false.
   FutureOr<DeviceLogReader> getLogReader({
-    covariant ApplicationPackage? app,
+    covariant ApplicationPackage app,
     bool includePastLogs = false,
   });
 
@@ -572,13 +572,13 @@ abstract class Device {
   /// start call. The build mode is not used by all platforms.
   Future<LaunchResult> startApp(
     covariant ApplicationPackage package, {
-    String? mainPath,
-    String? route,
-    required DebuggingOptions debuggingOptions,
+    String mainPath,
+    String route,
+    DebuggingOptions debuggingOptions,
     Map<String, Object?> platformArgs,
     bool prebuiltApplication = false,
     bool ipv6 = false,
-    String? userIdentifier,
+    String userIdentifier,
   });
 
   /// Whether this device implements support for hot reload.

packages/flutter_tools/lib/src/globals.dart

@@ -7,8 +7,11 @@
 import 'base/context.dart';
 import 'doctor.dart';
 import 'ios/simulators.dart';
+import 'macos/xcdevice.dart';
 
 export 'globals_null_migrated.dart';
 
 Doctor get doctor => context.get<Doctor>();
 IOSSimulatorUtils get iosSimulatorUtils => context.get<IOSSimulatorUtils>();
+
+XCDevice get xcdevice => context.get<XCDevice>();

packages/flutter_tools/lib/src/globals_null_migrated.dart

@@ -34,7 +34,6 @@ import 'ios/plist_parser.dart';
 import 'ios/xcodeproj.dart';
 import 'macos/cocoapods.dart';
 import 'macos/cocoapods_validator.dart';
-import 'macos/xcdevice.dart';
 import 'macos/xcode.dart';
 import 'persistent_tool_state.dart';
 import 'project.dart';
@@ -63,7 +62,6 @@ FlutterVersion get flutterVersion => context.get<FlutterVersion>()!;
 FuchsiaArtifacts? get fuchsiaArtifacts => context.get<FuchsiaArtifacts>();
 Usage get flutterUsage => context.get<Usage>()!;
 XcodeProjectInterpreter? get xcodeProjectInterpreter => context.get<XcodeProjectInterpreter>();
-XCDevice? get xcdevice => context.get<XCDevice>();
 Xcode? get xcode => context.get<Xcode>();
 IOSWorkflow? get iosWorkflow => context.get<IOSWorkflow>();
 LocalEngineLocator? get localEngineLocator => context.get<LocalEngineLocator>();

packages/flutter_tools/lib/src/ios/mac.dart

@@ -45,16 +45,6 @@ class IMobileDevice {
       _processUtils = ProcessUtils(logger: logger, processManager: processManager),
       _processManager = processManager;
 
-  /// Create an [IMobileDevice] for testing.
-  factory IMobileDevice.test({ required ProcessManager processManager }) {
-    return IMobileDevice(
-      artifacts: Artifacts.test(),
-      cache: Cache.test(processManager: processManager),
-      processManager: processManager,
-      logger: BufferLogger.test(),
-    );
-  }
-
   final String _idevicesyslogPath;
   final String _idevicescreenshotPath;
   final MapEntry<String, String> _dyLdLibEntry;
@@ -103,7 +93,7 @@ class IMobileDevice {
 Future<XcodeBuildResult> buildXcodeProject({
   required BuildableIOSApp app,
   required BuildInfo buildInfo,
-  String? targetOverride,
+  required String targetOverride,
   EnvironmentType environmentType = EnvironmentType.physical,
   DarwinArch? activeArch,
   bool codesign = true,

packages/flutter_tools/test/general.shard/ios/devices_test.dart

@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// @dart = 2.8
+
 import 'dart:async';
 import 'dart:io' as io;
 
@@ -37,17 +39,16 @@ void main() {
 
   group('IOSDevice', () {
     final List<Platform> unsupportedPlatforms = <Platform>[linuxPlatform, windowsPlatform];
-    late Cache cache;
-    late Logger logger;
-    late IOSDeploy iosDeploy;
-    late IMobileDevice iMobileDevice;
-    late FileSystem fileSystem;
+    Cache cache;
+    Logger logger;
+    IOSDeploy iosDeploy;
+    IMobileDevice iMobileDevice;
+    FileSystem nullFileSystem;
 
     setUp(() {
       final Artifacts artifacts = Artifacts.test();
       cache = Cache.test(processManager: FakeProcessManager.any());
       logger = BufferLogger.test();
-      fileSystem = MemoryFileSystem.test();
       iosDeploy = IOSDeploy(
         artifacts: artifacts,
         cache: cache,
@@ -67,7 +68,7 @@ void main() {
       IOSDevice(
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
-        fileSystem: fileSystem,
+        fileSystem: nullFileSystem,
         logger: logger,
         platform: macPlatform,
         iosDeploy: iosDeploy,
@@ -83,7 +84,7 @@ void main() {
       expect(IOSDevice(
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
-        fileSystem: fileSystem,
+        fileSystem: nullFileSystem,
         logger: logger,
         platform: macPlatform,
         iosDeploy: iosDeploy,
@@ -96,7 +97,7 @@ void main() {
       expect(IOSDevice(
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
-        fileSystem: fileSystem,
+        fileSystem: nullFileSystem,
         logger: logger,
         platform: macPlatform,
         iosDeploy: iosDeploy,
@@ -109,7 +110,7 @@ void main() {
       expect(IOSDevice(
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
-        fileSystem: fileSystem,
+        fileSystem: nullFileSystem,
         logger: logger,
         platform: macPlatform,
         iosDeploy: iosDeploy,
@@ -122,7 +123,7 @@ void main() {
       expect(IOSDevice(
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
-        fileSystem: fileSystem,
+        fileSystem: nullFileSystem,
         logger: logger,
         platform: macPlatform,
         iosDeploy: iosDeploy,
@@ -135,7 +136,7 @@ void main() {
       expect(IOSDevice(
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
-        fileSystem: fileSystem,
+        fileSystem: nullFileSystem,
         logger: logger,
         platform: macPlatform,
         iosDeploy: iosDeploy,
@@ -151,7 +152,7 @@ void main() {
       final IOSDevice device = IOSDevice(
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
-        fileSystem: fileSystem,
+        fileSystem: nullFileSystem,
         logger: logger,
         platform: macPlatform,
         iosDeploy: iosDeploy,
@@ -169,7 +170,7 @@ void main() {
       final IOSDevice device = IOSDevice(
         'device-123',
         iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
-        fileSystem: fileSystem,
+        fileSystem: nullFileSystem,
         logger: logger,
         platform: macPlatform,
         iosDeploy: iosDeploy,
@@ -193,7 +194,7 @@ void main() {
             IOSDevice(
               'device-123',
               iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
-              fileSystem: fileSystem,
+              fileSystem: nullFileSystem,
               logger: logger,
               platform: platform,
               iosDeploy: iosDeploy,
@@ -210,21 +211,21 @@ void main() {
     }
 
     group('.dispose()', () {
-      late IOSDevice device;
-      late FakeIOSApp appPackage1;
-      late FakeIOSApp appPackage2;
-      late IOSDeviceLogReader logReader1;
-      late IOSDeviceLogReader logReader2;
-      late FakeProcess process1;
-      late FakeProcess process2;
-      late FakeProcess process3;
-      late IOSDevicePortForwarder portForwarder;
-      late ForwardedPort forwardedPort;
-      late Cache cache;
-      late Logger logger;
-      late IOSDeploy iosDeploy;
-      late FileSystem fileSystem;
-      late IProxy iproxy;
+      IOSDevice device;
+      FakeIOSApp appPackage1;
+      FakeIOSApp appPackage2;
+      IOSDeviceLogReader logReader1;
+      IOSDeviceLogReader logReader2;
+      FakeProcess process1;
+      FakeProcess process2;
+      FakeProcess process3;
+      IOSDevicePortForwarder portForwarder;
+      ForwardedPort forwardedPort;
+      Cache cache;
+      Logger logger;
+      IOSDeploy iosDeploy;
+      FileSystem nullFileSystem;
+      IProxy iproxy;
 
       IOSDevicePortForwarder createPortForwarder(
           ForwardedPort forwardedPort,
@@ -234,7 +235,7 @@ void main() {
           id: device.id,
           logger: logger,
           operatingSystemUtils: OperatingSystemUtils(
-            fileSystem: fileSystem,
+            fileSystem: nullFileSystem,
             logger: logger,
             platform: FakePlatform(operatingSystem: 'macos'),
             processManager: FakeProcessManager.any(),
@@ -252,7 +253,7 @@ void main() {
         final IOSDeviceLogReader logReader = IOSDeviceLogReader.create(
           device: device,
           app: appPackage,
-          iMobileDevice: IMobileDevice.test(processManager: FakeProcessManager.any()),
+          iMobileDevice: null, // not used by this test.
         );
         logReader.idevicesyslogProcess = process;
         return logReader;
@@ -268,8 +269,6 @@ void main() {
         cache = Cache.test(
           processManager: FakeProcessManager.any(),
         );
-        fileSystem = MemoryFileSystem.test();
-        logger = BufferLogger.test();
         iosDeploy = IOSDeploy(
           artifacts: Artifacts.test(),
           cache: cache,
@@ -283,7 +282,7 @@ void main() {
         device = IOSDevice(
           '123',
           iProxy: IProxy.test(logger: logger, processManager: FakeProcessManager.any()),
-          fileSystem: fileSystem,
+          fileSystem: nullFileSystem,
           logger: logger,
           platform: macPlatform,
           iosDeploy: iosDeploy,
@@ -310,15 +309,15 @@ void main() {
   });
 
   group('polling', () {
-    late FakeXcdevice xcdevice;
-    late Cache cache;
-    late FakeProcessManager fakeProcessManager;
-    late BufferLogger logger;
-    late IOSDeploy iosDeploy;
-    late IMobileDevice iMobileDevice;
-    late IOSWorkflow iosWorkflow;
-    late IOSDevice device1;
-    late IOSDevice device2;
+    FakeXcdevice xcdevice;
+    Cache cache;
+    FakeProcessManager fakeProcessManager;
+    BufferLogger logger;
+    IOSDeploy iosDeploy;
+    IMobileDevice iMobileDevice;
+    IOSWorkflow iosWorkflow;
+    IOSDevice device1;
+    IOSDevice device2;
 
     setUp(() {
       xcdevice = FakeXcdevice();
@@ -415,22 +414,22 @@ void main() {
       await iosDevices.startPolling();
       expect(xcdevice.getAvailableIOSDevicesCount, 1);
 
-      expect(iosDevices.deviceNotifier!.items, isEmpty);
+      expect(iosDevices.deviceNotifier.items, isEmpty);
       expect(xcdevice.deviceEventController.hasListener, isTrue);
 
       xcdevice.deviceEventController.add(<XCDeviceEvent, String>{
         XCDeviceEvent.attach: 'd83d5bc53967baa0ee18626ba87b6254b2ab5418'
       });
       await added.future;
-      expect(iosDevices.deviceNotifier!.items.length, 2);
-      expect(iosDevices.deviceNotifier!.items, contains(device1));
-      expect(iosDevices.deviceNotifier!.items, contains(device2));
+      expect(iosDevices.deviceNotifier.items.length, 2);
+      expect(iosDevices.deviceNotifier.items, contains(device1));
+      expect(iosDevices.deviceNotifier.items, contains(device2));
 
       xcdevice.deviceEventController.add(<XCDeviceEvent, String>{
         XCDeviceEvent.detach: 'd83d5bc53967baa0ee18626ba87b6254b2ab5418'
       });
       await removed.future;
-      expect(iosDevices.deviceNotifier!.items, <Device>[device2]);
+      expect(iosDevices.deviceNotifier.items, <Device>[device2]);
 
       // Remove stream will throw over-completion if called more than once
       // which proves this is ignored.
@@ -490,7 +489,7 @@ void main() {
       xcdevice.devices.add(<IOSDevice>[]);
 
       await iosDevices.startPolling();
-      expect(iosDevices.deviceNotifier!.items, isEmpty);
+      expect(iosDevices.deviceNotifier.items, isEmpty);
       expect(xcdevice.deviceEventController.hasListener, isTrue);
 
       iosDevices.dispose();
@@ -532,9 +531,9 @@ void main() {
   });
 
   group('getDiagnostics', () {
-    late FakeXcdevice xcdevice;
-    late IOSWorkflow iosWorkflow;
-    late Logger logger;
+    FakeXcdevice xcdevice;
+    IOSWorkflow iosWorkflow;
+    Logger logger;
 
     setUp(() {
       xcdevice = FakeXcdevice();
@@ -602,7 +601,7 @@ class FakeXcdevice extends Fake implements XCDevice {
   }
 
   @override
-  Future<List<IOSDevice>> getAvailableIOSDevices({Duration? timeout}) async {
+  Future<List<IOSDevice>> getAvailableIOSDevices({Duration timeout}) async {
     return devices[getAvailableIOSDevicesCount++];
   }
 }

packages/flutter_tools/test/general.shard/ios/ios_device_project_test.dart

@@ -5,16 +5,12 @@
 // @dart = 2.8
 
 import 'package:file/memory.dart';
-import 'package:flutter_tools/src/artifacts.dart';
 import 'package:flutter_tools/src/base/file_system.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/build_info.dart';
-import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/ios/devices.dart';
-import 'package:flutter_tools/src/ios/ios_deploy.dart';
 import 'package:flutter_tools/src/ios/iproxy.dart';
-import 'package:flutter_tools/src/ios/mac.dart';
 import 'package:flutter_tools/src/project.dart';
 
 import '../../src/common.dart';
@@ -80,26 +76,17 @@ flutter:
 }
 
 IOSDevice setUpIOSDevice(FileSystem fileSystem) {
-  final Platform platform = FakePlatform(operatingSystem: 'macos');
-  final Logger logger = BufferLogger.test();
-  final ProcessManager processManager = FakeProcessManager.any();
   return IOSDevice(
     'test',
     fileSystem: fileSystem,
-    logger: logger,
-    iosDeploy: IOSDeploy(
-      platform: platform,
-      logger: logger,
-      processManager: processManager,
-      artifacts: Artifacts.test(),
-      cache: Cache.test(processManager: processManager),
-    ),
-    iMobileDevice: IMobileDevice.test(processManager: processManager),
-    platform: platform,
+    logger: BufferLogger.test(),
+    iosDeploy: null, // not used in this test
+    iMobileDevice: null, // not used in this test
+    platform: FakePlatform(operatingSystem: 'macos'),
     name: 'iPhone 1',
     sdkVersion: '13.3',
     cpuArchitecture: DarwinArch.arm64,
-    iProxy: IProxy.test(logger: logger, processManager: processManager),
+    iProxy: IProxy.test(logger: BufferLogger.test(), processManager: FakeProcessManager.any()),
     interfaceType: IOSDeviceConnectionInterface.usb,
   );
 }

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

@@ -326,7 +326,7 @@ void main() {
           processManager: fakeProcessManager,
           logger: logger,
           xcode: xcode,
-          platform: FakePlatform(operatingSystem: 'macos'),
+          platform: null,
           artifacts: Artifacts.test(),
           cache: Cache.test(processManager: FakeProcessManager.any()),
           iproxy: IProxy.test(logger: logger, processManager: fakeProcessManager),
@@ -354,7 +354,7 @@ void main() {
           processManager: fakeProcessManager,
           logger: logger,
           xcode: xcode,
-          platform: FakePlatform(operatingSystem: 'macos'),
+          platform: null,
           artifacts: Artifacts.test(),
           cache: Cache.test(processManager: FakeProcessManager.any()),
           iproxy: IProxy.test(logger: logger, processManager: fakeProcessManager),