diff --git a/packages/flutter_tools/lib/src/context_runner.dart b/packages/flutter_tools/lib/src/context_runner.dart index 21bc03d3bb9..1f686d4ed84 100644 --- a/packages/flutter_tools/lib/src/context_runner.dart +++ b/packages/flutter_tools/lib/src/context_runner.dart @@ -129,13 +129,6 @@ Future runInContext( FuchsiaWorkflow: () => FuchsiaWorkflow(), GradleUtils: () => GradleUtils(), HotRunnerConfig: () => HotRunnerConfig(), - IOSDeploy: () => IOSDeploy( - artifacts: globals.artifacts, - cache: globals.cache, - logger: globals.logger, - platform: globals.platform, - processManager: globals.processManager, - ), IOSSimulatorUtils: () => IOSSimulatorUtils( simControl: globals.simControl, xcode: globals.xcode, @@ -217,6 +210,13 @@ Future runInContext( logger: globals.logger, processManager: globals.processManager, ), + iosDeploy: IOSDeploy( + artifacts: globals.artifacts, + cache: globals.cache, + logger: globals.logger, + platform: globals.platform, + processManager: globals.processManager, + ), xcode: globals.xcode, ), XcodeProjectInterpreter: () => XcodeProjectInterpreter( diff --git a/packages/flutter_tools/lib/src/globals.dart b/packages/flutter_tools/lib/src/globals.dart index 0c6de6fcf59..2d80c8cd546 100644 --- a/packages/flutter_tools/lib/src/globals.dart +++ b/packages/flutter_tools/lib/src/globals.dart @@ -23,7 +23,6 @@ import 'base/user_messages.dart'; import 'build_system/build_system.dart'; import 'cache.dart'; import 'fuchsia/fuchsia_sdk.dart'; -import 'ios/ios_deploy.dart'; import 'ios/ios_workflow.dart'; import 'ios/plist_parser.dart'; import 'ios/simulators.dart'; @@ -75,7 +74,6 @@ AndroidSdk get androidSdk => context.get(); CocoaPods get cocoaPods => context.get(); FlutterVersion get flutterVersion => context.get(); FuchsiaArtifacts get fuchsiaArtifacts => context.get(); -IOSDeploy get iosDeploy => context.get(); IOSSimulatorUtils get iosSimulatorUtils => context.get(); IOSWorkflow get iosWorkflow => context.get(); SimControl get simControl => context.get(); diff --git a/packages/flutter_tools/lib/src/macos/xcode.dart b/packages/flutter_tools/lib/src/macos/xcode.dart index 8ae38d9da5b..e82a4da6a5c 100644 --- a/packages/flutter_tools/lib/src/macos/xcode.dart +++ b/packages/flutter_tools/lib/src/macos/xcode.dart @@ -17,6 +17,7 @@ import '../build_info.dart'; import '../convert.dart'; import '../globals.dart' as globals; import '../ios/devices.dart'; +import '../ios/ios_deploy.dart'; import '../ios/mac.dart'; import '../ios/xcodeproj.dart'; import '../reporting/reporting.dart'; @@ -198,14 +199,17 @@ class XCDevice { @required Logger logger, @required Xcode xcode, @required IMobileDevice iMobileDevice, + @required IOSDeploy iosDeploy, }) : _processUtils = ProcessUtils(logger: logger, processManager: processManager), - _logger = logger, + _logger = logger, _iMobileDevice = iMobileDevice, - _xcode = xcode; + _iosDeploy = iosDeploy, + _xcode = xcode; final ProcessUtils _processUtils; final Logger _logger; final IMobileDevice _iMobileDevice; + final IOSDeploy _iosDeploy; final Xcode _xcode; bool get isInstalled => _xcode.isInstalledAndMeetsVersionCheck && xcdevicePath != null; @@ -359,7 +363,7 @@ class XCDevice { artifacts: globals.artifacts, fileSystem: globals.fs, logger: globals.logger, - iosDeploy: globals.iosDeploy, + iosDeploy: _iosDeploy, iMobileDevice: _iMobileDevice, platform: globals.platform, )); diff --git a/packages/flutter_tools/test/general.shard/macos/xcode_test.dart b/packages/flutter_tools/test/general.shard/macos/xcode_test.dart index d7589b10fcc..dbf273c2889 100644 --- a/packages/flutter_tools/test/general.shard/macos/xcode_test.dart +++ b/packages/flutter_tools/test/general.shard/macos/xcode_test.dart @@ -217,6 +217,7 @@ void main() { logger: logger, xcode: mockXcode, iMobileDevice: null, + iosDeploy: null, ); });