Move globals.artifacts to globals_null_migrated, update imports (#83137)

packages/flutter_tools/bin/fuchsia_tester.dart

@@ -17,7 +17,7 @@ import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/context_runner.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/test/coverage_collector.dart';

packages/flutter_tools/lib/src/build_system/targets/web.dart

@@ -17,7 +17,7 @@ import '../../build_info.dart';
 import '../../cache.dart';
 import '../../dart/language_version.dart';
 import '../../dart/package_map.dart';
-import '../../globals.dart' as globals;
+import '../../globals_null_migrated.dart' as globals;
 import '../../project.dart';
 import '../build_system.dart';
 import '../depfile.dart';

packages/flutter_tools/lib/src/commands/assemble.dart

@@ -22,7 +22,7 @@ import '../build_system/targets/web.dart';
 import '../build_system/targets/windows.dart';
 import '../cache.dart';
 import '../convert.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../project.dart';
 import '../reporting/reporting.dart';
 import '../runner/flutter_command.dart';

packages/flutter_tools/lib/src/commands/attach.dart

@@ -21,7 +21,7 @@ import '../compile.dart';
 import '../device.dart';
 import '../device_port_forwarder.dart';
 import '../fuchsia/fuchsia_device.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../ios/devices.dart';
 import '../ios/simulators.dart';
 import '../mdns_discovery.dart';

packages/flutter_tools/lib/src/commands/build_ios.dart

@@ -14,7 +14,7 @@ import '../base/process.dart';
 import '../base/utils.dart';
 import '../build_info.dart';
 import '../convert.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../ios/application_package.dart';
 import '../ios/mac.dart';
 import '../runner/flutter_command.dart';

packages/flutter_tools/lib/src/commands/build_web.dart

@@ -10,7 +10,7 @@ import '../base/common.dart';
 import '../build_info.dart';
 import '../build_system/targets/web.dart';
 import '../features.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../project.dart';
 import '../runner/flutter_command.dart'
     show DevelopmentArtifact, FlutterCommandResult;

packages/flutter_tools/lib/src/commands/drive.dart

@@ -20,7 +20,7 @@ import '../build_info.dart';
 import '../dart/package_map.dart';
 import '../device.dart';
 import '../drive/drive_service.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../resident_runner.dart';
 import '../runner/flutter_command.dart' show FlutterCommandResult, FlutterOptions;
 import '../web/web_device.dart';

packages/flutter_tools/lib/src/commands/format.dart

@@ -6,7 +6,7 @@
 
 import '../artifacts.dart';
 import '../base/common.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../runner/flutter_command.dart';
 
 class FormatCommand extends FlutterCommand {

packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart

@@ -16,7 +16,7 @@ import '../build_info.dart';
 import '../bundle.dart';
 import '../convert.dart';
 import '../devfs.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../project.dart';
 
 import 'fuchsia_pm.dart';

packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart

@@ -10,7 +10,7 @@ import '../artifacts.dart';
 import '../base/common.dart';
 import '../base/logger.dart';
 import '../build_info.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../project.dart';
 
 /// This is a simple wrapper around the custom kernel compiler from the Fuchsia

packages/flutter_tools/lib/src/globals.dart

@@ -5,7 +5,6 @@
 // @dart = 2.8
 
 import 'android/gradle_utils.dart';
-import 'artifacts.dart';
 import 'base/context.dart';
 import 'build_system/build_system.dart';
 import 'device.dart';
@@ -22,7 +21,6 @@ import 'runner/local_engine.dart';
 
 export 'globals_null_migrated.dart';
 
-Artifacts get artifacts => context.get<Artifacts>();
 BuildSystem get buildSystem => context.get<BuildSystem>();
 CrashReporter get crashReporter => context.get<CrashReporter>();
 Doctor get doctor => context.get<Doctor>();

packages/flutter_tools/lib/src/globals_null_migrated.dart

@@ -6,6 +6,7 @@ import 'package:process/process.dart';
 
 import 'android/android_sdk.dart';
 import 'android/android_studio.dart';
+import 'artifacts.dart';
 import 'base/bot_detector.dart';
 import 'base/config.dart';
 import 'base/context.dart';
@@ -31,6 +32,7 @@ import 'persistent_tool_state.dart';
 import 'reporting/reporting.dart';
 import 'version.dart';
 
+Artifacts? get artifacts => context.get<Artifacts>();
 Cache get cache => context.get<Cache>()!;
 Config get config => context.get<Config>()!;
 HttpClientFactory? get httpClientFactory => context.get<HttpClientFactory>();

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

@@ -10,7 +10,7 @@ import '../base/context.dart';
 import '../base/process.dart';
 import '../base/version.dart';
 import '../build_info.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../macos/xcode.dart';
 
 const bool kBitcodeEnabledDefault = false;

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

@@ -11,7 +11,7 @@ import '../base/file_system.dart';
 import '../build_info.dart';
 import '../cache.dart';
 import '../flutter_manifest.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../project.dart';
 
 String flutterMacOSFrameworkDir(BuildMode mode, FileSystem fileSystem,

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

@@ -35,7 +35,7 @@ import '../compile.dart';
 import '../convert.dart';
 import '../dart/package_map.dart';
 import '../devfs.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../project.dart';
 import '../vmservice.dart';
 import '../web/bootstrap.dart';

packages/flutter_tools/lib/src/linux/build_linux.dart

@@ -16,7 +16,7 @@ import '../cache.dart';
 import '../cmake.dart';
 import '../convert.dart';
 import '../flutter_plugins.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../migrations/cmake_custom_command_migration.dart';
 import '../project.dart';
 

packages/flutter_tools/lib/src/test/runner.dart

@@ -11,7 +11,7 @@ import '../base/common.dart';
 import '../base/file_system.dart';
 import '../base/io.dart';
 import '../device.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../project.dart';
 import '../web/chrome.dart';
 import '../web/memory_fs.dart';

packages/flutter_tools/lib/src/test/test_compiler.dart

@@ -13,7 +13,7 @@ import '../base/file_system.dart';
 import '../build_info.dart';
 import '../bundle.dart';
 import '../compile.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../project.dart';
 
 /// A request to the [TestCompiler] for recompilation.

packages/flutter_tools/lib/src/windows/build_windows.dart

@@ -16,7 +16,7 @@ import '../cache.dart';
 import '../cmake.dart';
 import '../convert.dart';
 import '../flutter_plugins.dart';
-import '../globals.dart' as globals;
+import '../globals_null_migrated.dart' as globals;
 import '../migrations/cmake_custom_command_migration.dart';
 import '../project.dart';
 import 'install_manifest.dart';

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

@@ -18,7 +18,7 @@ import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/analyze.dart';
 import 'package:flutter_tools/src/dart/analysis.dart';
 import 'package:flutter_tools/src/dart/pub.dart';
-import 'package:flutter_tools/src/globals.dart' as globals;
+import 'package:flutter_tools/src/globals_null_migrated.dart' as globals;
 import 'package:process/process.dart';
 
 import '../../src/common.dart';

packages/flutter_tools/test/commands.shard/permeable/create_test.dart

@@ -21,7 +21,7 @@ import 'package:flutter_tools/src/commands/create.dart';
 import 'package:flutter_tools/src/commands/create_base.dart';
 import 'package:flutter_tools/src/dart/pub.dart';
 import 'package:flutter_tools/src/features.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/version.dart';
 import 'package:process/process.dart';

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

@@ -13,7 +13,7 @@ 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/build_system/build_system.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';
 

packages/flutter_tools/test/general.shard/build_system/source_test.dart

@@ -10,7 +10,7 @@ import 'package:flutter_tools/src/base/platform.dart';
 import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/build_system/build_system.dart';
 import 'package:flutter_tools/src/build_system/exceptions.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/fake_process_manager.dart';

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

@@ -25,7 +25,7 @@ import 'package:flutter_tools/src/devfs.dart';
 import 'package:flutter_tools/src/device.dart';
 import 'package:flutter_tools/src/device_port_forwarder.dart';
 import 'package:flutter_tools/src/features.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/reporting/reporting.dart';
 import 'package:flutter_tools/src/resident_devtools_handler.dart';
 import 'package:flutter_tools/src/resident_runner.dart';

packages/flutter_tools/test/general.shard/web/devfs_web_test.dart

@@ -13,7 +13,7 @@ import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/build_system/targets/web.dart';
 import 'package:flutter_tools/src/compile.dart';
 import 'package:flutter_tools/src/convert.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/isolated/devfs_web.dart';
 import 'package:flutter_tools/src/web/compile.dart';
 import 'package:package_config/package_config.dart';

packages/flutter_tools/test/integration.shard/generated_plugin_registrant_test.dart

@@ -14,7 +14,7 @@ import 'package:flutter_tools/src/base/io.dart';
 import 'package:flutter_tools/src/cache.dart';
 import 'package:flutter_tools/src/commands/create.dart';
 import 'package:flutter_tools/src/dart/pub.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';