From 0d79013a81d6aeb9d7b05d09bcafad6c64c09213 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Fri, 21 May 2021 18:35:02 -0700 Subject: [PATCH] Move globals.artifacts to globals_null_migrated, update imports (#83137) --- packages/flutter_tools/bin/fuchsia_tester.dart | 2 +- packages/flutter_tools/lib/src/build_system/targets/web.dart | 2 +- packages/flutter_tools/lib/src/commands/assemble.dart | 2 +- packages/flutter_tools/lib/src/commands/attach.dart | 2 +- packages/flutter_tools/lib/src/commands/build_ios.dart | 2 +- packages/flutter_tools/lib/src/commands/build_web.dart | 2 +- packages/flutter_tools/lib/src/commands/drive.dart | 2 +- packages/flutter_tools/lib/src/commands/format.dart | 2 +- packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart | 2 +- .../flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart | 2 +- packages/flutter_tools/lib/src/globals.dart | 2 -- packages/flutter_tools/lib/src/globals_null_migrated.dart | 2 ++ packages/flutter_tools/lib/src/ios/bitcode.dart | 2 +- packages/flutter_tools/lib/src/ios/xcode_build_settings.dart | 2 +- packages/flutter_tools/lib/src/isolated/devfs_web.dart | 2 +- packages/flutter_tools/lib/src/linux/build_linux.dart | 2 +- packages/flutter_tools/lib/src/test/runner.dart | 2 +- packages/flutter_tools/lib/src/test/test_compiler.dart | 2 +- packages/flutter_tools/lib/src/windows/build_windows.dart | 2 +- .../test/commands.shard/hermetic/analyze_continuously_test.dart | 2 +- .../test/commands.shard/permeable/create_test.dart | 2 +- .../deferred_components_gen_snapshot_validator_test.dart | 2 +- .../test/general.shard/build_system/source_test.dart | 2 +- .../flutter_tools/test/general.shard/resident_runner_test.dart | 2 +- .../flutter_tools/test/general.shard/web/devfs_web_test.dart | 2 +- .../integration.shard/generated_plugin_registrant_test.dart | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/flutter_tools/bin/fuchsia_tester.dart b/packages/flutter_tools/bin/fuchsia_tester.dart index 9d51f83a99..305aab2f91 100644 --- a/packages/flutter_tools/bin/fuchsia_tester.dart +++ b/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'; diff --git a/packages/flutter_tools/lib/src/build_system/targets/web.dart b/packages/flutter_tools/lib/src/build_system/targets/web.dart index ee53e0791f..640a54348a 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/web.dart +++ b/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'; diff --git a/packages/flutter_tools/lib/src/commands/assemble.dart b/packages/flutter_tools/lib/src/commands/assemble.dart index 14d9bc4dc5..8b74194b81 100644 --- a/packages/flutter_tools/lib/src/commands/assemble.dart +++ b/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'; diff --git a/packages/flutter_tools/lib/src/commands/attach.dart b/packages/flutter_tools/lib/src/commands/attach.dart index 3afade8879..b064271f6c 100644 --- a/packages/flutter_tools/lib/src/commands/attach.dart +++ b/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'; diff --git a/packages/flutter_tools/lib/src/commands/build_ios.dart b/packages/flutter_tools/lib/src/commands/build_ios.dart index 8e15e3579b..a9f7ecbd06 100644 --- a/packages/flutter_tools/lib/src/commands/build_ios.dart +++ b/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'; diff --git a/packages/flutter_tools/lib/src/commands/build_web.dart b/packages/flutter_tools/lib/src/commands/build_web.dart index a82b095a89..ca48180808 100644 --- a/packages/flutter_tools/lib/src/commands/build_web.dart +++ b/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; diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart index 8faf27b2c9..49326df3f6 100644 --- a/packages/flutter_tools/lib/src/commands/drive.dart +++ b/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'; diff --git a/packages/flutter_tools/lib/src/commands/format.dart b/packages/flutter_tools/lib/src/commands/format.dart index 3e2eaa8d42..5a3b20f6bb 100644 --- a/packages/flutter_tools/lib/src/commands/format.dart +++ b/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 { diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart index f2347d2060..663e322e0a 100644 --- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart +++ b/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'; diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart index 05ceae8012..d9ef92d6a9 100644 --- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart +++ b/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 diff --git a/packages/flutter_tools/lib/src/globals.dart b/packages/flutter_tools/lib/src/globals.dart index c5e6171763..448fdc994d 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 '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(); BuildSystem get buildSystem => context.get(); CrashReporter get crashReporter => context.get(); Doctor get doctor => 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 30a311a71a..1781036d4d 100644 --- a/packages/flutter_tools/lib/src/globals_null_migrated.dart +++ b/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(); Cache get cache => context.get()!; Config get config => context.get()!; HttpClientFactory? get httpClientFactory => context.get(); diff --git a/packages/flutter_tools/lib/src/ios/bitcode.dart b/packages/flutter_tools/lib/src/ios/bitcode.dart index ecc703652a..64f0d18c9e 100644 --- a/packages/flutter_tools/lib/src/ios/bitcode.dart +++ b/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; diff --git a/packages/flutter_tools/lib/src/ios/xcode_build_settings.dart b/packages/flutter_tools/lib/src/ios/xcode_build_settings.dart index e0c2eec01b..f92eab35ae 100644 --- a/packages/flutter_tools/lib/src/ios/xcode_build_settings.dart +++ b/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, diff --git a/packages/flutter_tools/lib/src/isolated/devfs_web.dart b/packages/flutter_tools/lib/src/isolated/devfs_web.dart index 000341275e..cfffb87005 100644 --- a/packages/flutter_tools/lib/src/isolated/devfs_web.dart +++ b/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'; diff --git a/packages/flutter_tools/lib/src/linux/build_linux.dart b/packages/flutter_tools/lib/src/linux/build_linux.dart index 38c8478659..ce45b0fed2 100644 --- a/packages/flutter_tools/lib/src/linux/build_linux.dart +++ b/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'; diff --git a/packages/flutter_tools/lib/src/test/runner.dart b/packages/flutter_tools/lib/src/test/runner.dart index df23b33ee5..3ea50eb1d2 100644 --- a/packages/flutter_tools/lib/src/test/runner.dart +++ b/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'; diff --git a/packages/flutter_tools/lib/src/test/test_compiler.dart b/packages/flutter_tools/lib/src/test/test_compiler.dart index d1918d55d2..f7702cc017 100644 --- a/packages/flutter_tools/lib/src/test/test_compiler.dart +++ b/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. diff --git a/packages/flutter_tools/lib/src/windows/build_windows.dart b/packages/flutter_tools/lib/src/windows/build_windows.dart index d878d8eee3..3c4cf739b6 100644 --- a/packages/flutter_tools/lib/src/windows/build_windows.dart +++ b/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'; diff --git a/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart index 644024c10e..36d67c3ae4 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/analyze_continuously_test.dart +++ b/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'; diff --git a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart b/packages/flutter_tools/test/commands.shard/permeable/create_test.dart index a9f033b395..19f6cca332 100755 --- a/packages/flutter_tools/test/commands.shard/permeable/create_test.dart +++ b/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'; diff --git a/packages/flutter_tools/test/general.shard/android/deferred_components_gen_snapshot_validator_test.dart b/packages/flutter_tools/test/general.shard/android/deferred_components_gen_snapshot_validator_test.dart index edf9661996..cf7d97f86c 100644 --- a/packages/flutter_tools/test/general.shard/android/deferred_components_gen_snapshot_validator_test.dart +++ b/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'; diff --git a/packages/flutter_tools/test/general.shard/build_system/source_test.dart b/packages/flutter_tools/test/general.shard/build_system/source_test.dart index 46e1014630..5ad4f27cb5 100644 --- a/packages/flutter_tools/test/general.shard/build_system/source_test.dart +++ b/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'; diff --git a/packages/flutter_tools/test/general.shard/resident_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_runner_test.dart index 8a52736fa9..3aeb68ead8 100644 --- a/packages/flutter_tools/test/general.shard/resident_runner_test.dart +++ b/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'; diff --git a/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart b/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart index 819934f7d8..80db64bba3 100644 --- a/packages/flutter_tools/test/general.shard/web/devfs_web_test.dart +++ b/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'; diff --git a/packages/flutter_tools/test/integration.shard/generated_plugin_registrant_test.dart b/packages/flutter_tools/test/integration.shard/generated_plugin_registrant_test.dart index 83c8021dd1..d640136e6e 100644 --- a/packages/flutter_tools/test/integration.shard/generated_plugin_registrant_test.dart +++ b/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';