From 6253f9018cb9de8604d9fb0fc7dc268ccd07c11d Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 8 Oct 2021 12:37:48 -0700 Subject: [PATCH] Move DeviceManager into null migrated globals library (#91457) --- packages/flutter_tools/lib/src/commands/daemon.dart | 2 +- packages/flutter_tools/lib/src/commands/run.dart | 2 +- packages/flutter_tools/lib/src/doctor.dart | 2 +- packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart | 2 +- packages/flutter_tools/lib/src/globals.dart | 2 -- packages/flutter_tools/lib/src/globals_null_migrated.dart | 2 ++ .../flutter_tools/lib/src/runner/flutter_command_runner.dart | 2 +- .../test/commands.shard/hermetic/devices_test.dart | 2 +- .../flutter_tools/test/commands.shard/hermetic/run_test.dart | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart index 83c5883163..c9c320a4a7 100644 --- a/packages/flutter_tools/lib/src/commands/daemon.dart +++ b/packages/flutter_tools/lib/src/commands/daemon.dart @@ -23,7 +23,7 @@ import '../device.dart'; import '../device_port_forwarder.dart'; import '../emulator.dart'; import '../features.dart'; -import '../globals.dart' as globals; +import '../globals_null_migrated.dart' as globals; import '../project.dart'; import '../resident_runner.dart'; import '../run_cold.dart'; diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart index ef9999a958..3f1e025719 100644 --- a/packages/flutter_tools/lib/src/commands/run.dart +++ b/packages/flutter_tools/lib/src/commands/run.dart @@ -16,7 +16,7 @@ import '../base/utils.dart'; import '../build_info.dart'; import '../device.dart'; import '../features.dart'; -import '../globals.dart' as globals; +import '../globals_null_migrated.dart' as globals; import '../project.dart'; import '../reporting/reporting.dart'; import '../resident_runner.dart'; diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart index 3ee059ac4b..9ca3004ff3 100644 --- a/packages/flutter_tools/lib/src/doctor.dart +++ b/packages/flutter_tools/lib/src/doctor.dart @@ -24,7 +24,7 @@ import 'device.dart'; import 'doctor_validator.dart'; import 'features.dart'; import 'fuchsia/fuchsia_workflow.dart'; -import 'globals.dart' as globals; +import 'globals_null_migrated.dart' as globals; import 'intellij/intellij_validator.dart'; import 'linux/linux_doctor.dart'; import 'linux/linux_workflow.dart'; diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart index b9d3089606..4fc131267e 100644 --- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart +++ b/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart @@ -22,7 +22,7 @@ import '../base/time.dart'; import '../build_info.dart'; import '../device.dart'; import '../device_port_forwarder.dart'; -import '../globals.dart' as globals; +import '../globals_null_migrated.dart' as globals; import '../project.dart'; import '../vmservice.dart'; diff --git a/packages/flutter_tools/lib/src/globals.dart b/packages/flutter_tools/lib/src/globals.dart index 05070d007a..764cddb816 100644 --- a/packages/flutter_tools/lib/src/globals.dart +++ b/packages/flutter_tools/lib/src/globals.dart @@ -5,7 +5,6 @@ // @dart = 2.8 import 'base/context.dart'; -import 'device.dart'; import 'doctor.dart'; import 'ios/simulators.dart'; import 'macos/xcdevice.dart'; @@ -15,7 +14,6 @@ export 'globals_null_migrated.dart'; CrashReporter get crashReporter => context.get(); Doctor get doctor => context.get(); -DeviceManager get deviceManager => context.get(); IOSSimulatorUtils get iosSimulatorUtils => context.get(); XCDevice get xcdevice => context.get(); diff --git a/packages/flutter_tools/lib/src/globals_null_migrated.dart b/packages/flutter_tools/lib/src/globals_null_migrated.dart index 0a9cc8f461..89c91ab444 100644 --- a/packages/flutter_tools/lib/src/globals_null_migrated.dart +++ b/packages/flutter_tools/lib/src/globals_null_migrated.dart @@ -27,6 +27,7 @@ import 'base/user_messages.dart'; import 'build_system/build_system.dart'; import 'cache.dart'; import 'custom_devices/custom_devices_config.dart'; +import 'device.dart'; import 'fuchsia/fuchsia_sdk.dart'; import 'ios/ios_workflow.dart'; import 'ios/plist_parser.dart'; @@ -48,6 +49,7 @@ BuildSystem? get buildSystem => context.get(); Cache get cache => context.get()!; CocoaPodsValidator? get cocoapodsValidator => context.get(); Config get config => context.get()!; +DeviceManager? get deviceManager => context.get(); HttpClientFactory? get httpClientFactory => context.get(); Logger get logger => context.get()!; OperatingSystemUtils get os => context.get()!; diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart index 8960fd3e14..542ae22acf 100644 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart @@ -18,7 +18,7 @@ import '../base/user_messages.dart'; import '../base/utils.dart'; import '../cache.dart'; import '../convert.dart'; -import '../globals.dart' as globals; +import '../globals_null_migrated.dart' as globals; import '../tester/flutter_tester.dart'; import '../web/web_device.dart'; diff --git a/packages/flutter_tools/test/commands.shard/hermetic/devices_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/devices_test.dart index 427f66cfad..4bb74d806b 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/devices_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/devices_test.dart @@ -11,7 +11,7 @@ import 'package:flutter_tools/src/artifacts.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/devices.dart'; import 'package:flutter_tools/src/device.dart'; -import 'package:flutter_tools/src/globals.dart' as globals; +import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; import '../../src/common.dart'; import '../../src/context.dart'; diff --git a/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart index 96afec3551..8a916865b3 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart @@ -26,7 +26,7 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/run.dart'; import 'package:flutter_tools/src/devfs.dart'; import 'package:flutter_tools/src/device.dart'; -import 'package:flutter_tools/src/globals.dart' as globals; +import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; import 'package:flutter_tools/src/project.dart'; import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:flutter_tools/src/resident_runner.dart';