Remove globals_null_migrated.dart, move into globals.dart (#92861)
diff --git a/packages/flutter_tools/bin/fuchsia_asset_builder.dart b/packages/flutter_tools/bin/fuchsia_asset_builder.dart index 1884823..ce20d9b 100644 --- a/packages/flutter_tools/bin/fuchsia_asset_builder.dart +++ b/packages/flutter_tools/bin/fuchsia_asset_builder.dart
@@ -16,7 +16,7 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/context_runner.dart'; import 'package:flutter_tools/src/devfs.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/reporting/reporting.dart'; const String _kOptionPackages = 'packages';
diff --git a/packages/flutter_tools/bin/fuchsia_tester.dart b/packages/flutter_tools/bin/fuchsia_tester.dart index 072f930..5b2c309 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/cache.dart'; import 'package:flutter_tools/src/context_runner.dart'; import 'package:flutter_tools/src/device.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.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/executable.dart b/packages/flutter_tools/lib/executable.dart index dffc009..ffdde98 100644 --- a/packages/flutter_tools/lib/executable.dart +++ b/packages/flutter_tools/lib/executable.dart
@@ -50,7 +50,7 @@ import 'src/commands/upgrade.dart'; import 'src/devtools_launcher.dart'; import 'src/features.dart'; -import 'src/globals_null_migrated.dart' as globals; +import 'src/globals.dart' as globals; // Files in `isolated` are intentionally excluded from google3 tooling. import 'src/isolated/mustache_template.dart'; import 'src/isolated/resident_web_runner.dart';
diff --git a/packages/flutter_tools/lib/src/android/android_sdk.dart b/packages/flutter_tools/lib/src/android/android_sdk.dart index ba3d01f..8c34ef9 100644 --- a/packages/flutter_tools/lib/src/android/android_sdk.dart +++ b/packages/flutter_tools/lib/src/android/android_sdk.dart
@@ -9,7 +9,7 @@ import '../base/process.dart'; import '../base/version.dart'; import '../convert.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import 'android_studio.dart'; // ANDROID_HOME is deprecated.
diff --git a/packages/flutter_tools/lib/src/android/android_studio.dart b/packages/flutter_tools/lib/src/android/android_studio.dart index 18f5678..3a1b062 100644 --- a/packages/flutter_tools/lib/src/android/android_studio.dart +++ b/packages/flutter_tools/lib/src/android/android_studio.dart
@@ -8,7 +8,7 @@ import '../base/utils.dart'; import '../base/version.dart'; import '../convert.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../ios/plist_parser.dart'; import 'android_studio_validator.dart';
diff --git a/packages/flutter_tools/lib/src/android/deferred_components_prebuild_validator.dart b/packages/flutter_tools/lib/src/android/deferred_components_prebuild_validator.dart index 8d7cbba..f11236b 100644 --- a/packages/flutter_tools/lib/src/android/deferred_components_prebuild_validator.dart +++ b/packages/flutter_tools/lib/src/android/deferred_components_prebuild_validator.dart
@@ -9,7 +9,7 @@ import '../base/file_system.dart'; import '../base/logger.dart'; import '../base/platform.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../template.dart'; import 'deferred_components_validator.dart';
diff --git a/packages/flutter_tools/lib/src/android/gradle_errors.dart b/packages/flutter_tools/lib/src/android/gradle_errors.dart index 997c715..d60f9ef 100644 --- a/packages/flutter_tools/lib/src/android/gradle_errors.dart +++ b/packages/flutter_tools/lib/src/android/gradle_errors.dart
@@ -8,7 +8,7 @@ import '../base/file_system.dart'; import '../base/process.dart'; import '../base/terminal.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../reporting/reporting.dart'; import 'android_studio.dart';
diff --git a/packages/flutter_tools/lib/src/android/gradle_utils.dart b/packages/flutter_tools/lib/src/android/gradle_utils.dart index 9f5d768..5a1c02d 100644 --- a/packages/flutter_tools/lib/src/android/gradle_utils.dart +++ b/packages/flutter_tools/lib/src/android/gradle_utils.dart
@@ -14,7 +14,7 @@ import '../base/version.dart'; import '../build_info.dart'; import '../cache.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../reporting/reporting.dart'; import 'android_sdk.dart';
diff --git a/packages/flutter_tools/lib/src/artifacts.dart b/packages/flutter_tools/lib/src/artifacts.dart index 7e348bb..c1b5cc7 100644 --- a/packages/flutter_tools/lib/src/artifacts.dart +++ b/packages/flutter_tools/lib/src/artifacts.dart
@@ -12,7 +12,7 @@ import 'base/utils.dart'; import 'build_info.dart'; import 'cache.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; enum Artifact { /// The tool which compiles a dart kernel file into native code.
diff --git a/packages/flutter_tools/lib/src/base/task_queue.dart b/packages/flutter_tools/lib/src/base/task_queue.dart index a83baff..b93359a 100644 --- a/packages/flutter_tools/lib/src/base/task_queue.dart +++ b/packages/flutter_tools/lib/src/base/task_queue.dart
@@ -5,7 +5,7 @@ import 'dart:async'; import 'dart:collection'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; /// A closure type used by the [TaskQueue]. typedef TaskQueueClosure<T> = Future<T> Function();
diff --git a/packages/flutter_tools/lib/src/build_info.dart b/packages/flutter_tools/lib/src/build_info.dart index 765e9f8..06e429a 100644 --- a/packages/flutter_tools/lib/src/build_info.dart +++ b/packages/flutter_tools/lib/src/build_info.dart
@@ -11,7 +11,7 @@ import 'base/os.dart'; import 'base/utils.dart'; import 'convert.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; /// Whether icon font subsetting is enabled by default. const bool kIconTreeShakerEnabledDefault = true;
diff --git a/packages/flutter_tools/lib/src/build_system/targets/android.dart b/packages/flutter_tools/lib/src/build_system/targets/android.dart index b9e7dce..ee86042 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/android.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/android.dart
@@ -7,7 +7,7 @@ import '../../base/deferred_component.dart'; import '../../base/file_system.dart'; import '../../build_info.dart'; -import '../../globals_null_migrated.dart' as globals show xcode; +import '../../globals.dart' as globals show xcode; import '../../project.dart'; import '../build_system.dart'; import '../depfile.dart';
diff --git a/packages/flutter_tools/lib/src/build_system/targets/common.dart b/packages/flutter_tools/lib/src/build_system/targets/common.dart index 05a048e..6b0ac8d 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/common.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/common.dart
@@ -10,7 +10,7 @@ import '../../build_info.dart'; import '../../compile.dart'; import '../../dart/package_map.dart'; -import '../../globals_null_migrated.dart' as globals show xcode; +import '../../globals.dart' as globals show xcode; import '../build_system.dart'; import '../depfile.dart'; import '../exceptions.dart';
diff --git a/packages/flutter_tools/lib/src/build_system/targets/ios.dart b/packages/flutter_tools/lib/src/build_system/targets/ios.dart index 94d53a0..e92cbd0 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/ios.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/ios.dart
@@ -12,7 +12,7 @@ import '../../base/file_system.dart'; import '../../base/io.dart'; import '../../build_info.dart'; -import '../../globals_null_migrated.dart' as globals show xcode; +import '../../globals.dart' as globals show xcode; import '../../macos/xcode.dart'; import '../../project.dart'; import '../build_system.dart';
diff --git a/packages/flutter_tools/lib/src/build_system/targets/macos.dart b/packages/flutter_tools/lib/src/build_system/targets/macos.dart index 9672906..35f3b60 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/macos.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/macos.dart
@@ -10,7 +10,7 @@ import '../../base/io.dart'; import '../../base/process.dart'; import '../../build_info.dart'; -import '../../globals_null_migrated.dart' as globals show xcode; +import '../../globals.dart' as globals show xcode; import '../build_system.dart'; import '../depfile.dart'; import '../exceptions.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 6a74cf3..a8c1a0d 100644 --- a/packages/flutter_tools/lib/src/build_system/targets/web.dart +++ b/packages/flutter_tools/lib/src/build_system/targets/web.dart
@@ -18,7 +18,7 @@ import '../../convert.dart'; import '../../dart/language_version.dart'; import '../../dart/package_map.dart'; -import '../../globals_null_migrated.dart' as globals; +import '../../globals.dart' as globals; import '../../project.dart'; import '../build_system.dart'; import '../depfile.dart';
diff --git a/packages/flutter_tools/lib/src/bundle.dart b/packages/flutter_tools/lib/src/bundle.dart index 4fe5f05..6eed94e 100644 --- a/packages/flutter_tools/lib/src/bundle.dart +++ b/packages/flutter_tools/lib/src/bundle.dart
@@ -9,7 +9,7 @@ import 'base/file_system.dart'; import 'build_info.dart'; import 'convert.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; String get defaultMainPath => globals.fs.path.join('lib', 'main.dart'); const String defaultManifestPath = 'pubspec.yaml';
diff --git a/packages/flutter_tools/lib/src/bundle_builder.dart b/packages/flutter_tools/lib/src/bundle_builder.dart index f437a50..0c13cba 100644 --- a/packages/flutter_tools/lib/src/bundle_builder.dart +++ b/packages/flutter_tools/lib/src/bundle_builder.dart
@@ -16,7 +16,7 @@ import 'bundle.dart'; import 'cache.dart'; import 'devfs.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; import 'project.dart';
diff --git a/packages/flutter_tools/lib/src/commands/analyze_base.dart b/packages/flutter_tools/lib/src/commands/analyze_base.dart index ef7a1c5..1401f74 100644 --- a/packages/flutter_tools/lib/src/commands/analyze_base.dart +++ b/packages/flutter_tools/lib/src/commands/analyze_base.dart
@@ -17,7 +17,7 @@ import '../base/terminal.dart'; import '../base/utils.dart'; import '../cache.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; /// Common behavior for `flutter analyze` and `flutter analyze --watch` abstract class AnalyzeBase {
diff --git a/packages/flutter_tools/lib/src/commands/assemble.dart b/packages/flutter_tools/lib/src/commands/assemble.dart index 9c06a44..2fc67cf 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/windows.dart'; import '../cache.dart'; import '../convert.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.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 c9618d6..39d98c2 100644 --- a/packages/flutter_tools/lib/src/commands/attach.dart +++ b/packages/flutter_tools/lib/src/commands/attach.dart
@@ -21,7 +21,7 @@ import '../device.dart'; import '../device_port_forwarder.dart'; import '../fuchsia/fuchsia_device.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../ios/devices.dart'; import '../ios/simulators.dart'; import '../macos/macos_ipad_device.dart';
diff --git a/packages/flutter_tools/lib/src/commands/build.dart b/packages/flutter_tools/lib/src/commands/build.dart index 2fc4b73..25ac316 100644 --- a/packages/flutter_tools/lib/src/commands/build.dart +++ b/packages/flutter_tools/lib/src/commands/build.dart
@@ -10,7 +10,7 @@ import '../commands/build_linux.dart'; import '../commands/build_macos.dart'; import '../commands/build_windows.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../runner/flutter_command.dart'; import 'build_aar.dart'; import 'build_apk.dart';
diff --git a/packages/flutter_tools/lib/src/commands/build_aar.dart b/packages/flutter_tools/lib/src/commands/build_aar.dart index 4a3d277..aa26185 100644 --- a/packages/flutter_tools/lib/src/commands/build_aar.dart +++ b/packages/flutter_tools/lib/src/commands/build_aar.dart
@@ -13,7 +13,7 @@ import '../base/os.dart'; import '../build_info.dart'; import '../cache.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../reporting/reporting.dart'; import '../runner/flutter_command.dart' show FlutterCommandResult;
diff --git a/packages/flutter_tools/lib/src/commands/build_apk.dart b/packages/flutter_tools/lib/src/commands/build_apk.dart index 63caab5..9c619dd 100644 --- a/packages/flutter_tools/lib/src/commands/build_apk.dart +++ b/packages/flutter_tools/lib/src/commands/build_apk.dart
@@ -9,7 +9,7 @@ import '../android/gradle_utils.dart'; import '../build_info.dart'; import '../cache.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../reporting/reporting.dart'; import '../runner/flutter_command.dart' show FlutterCommandResult;
diff --git a/packages/flutter_tools/lib/src/commands/build_appbundle.dart b/packages/flutter_tools/lib/src/commands/build_appbundle.dart index 7d9a282..3cf4211 100644 --- a/packages/flutter_tools/lib/src/commands/build_appbundle.dart +++ b/packages/flutter_tools/lib/src/commands/build_appbundle.dart
@@ -12,7 +12,7 @@ import '../base/file_system.dart'; import '../build_info.dart'; import '../cache.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../reporting/reporting.dart'; import '../runner/flutter_command.dart' show FlutterCommandResult;
diff --git a/packages/flutter_tools/lib/src/commands/build_bundle.dart b/packages/flutter_tools/lib/src/commands/build_bundle.dart index 3b48eec..44ec592 100644 --- a/packages/flutter_tools/lib/src/commands/build_bundle.dart +++ b/packages/flutter_tools/lib/src/commands/build_bundle.dart
@@ -9,7 +9,7 @@ import '../bundle.dart'; import '../bundle_builder.dart'; import '../features.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../reporting/reporting.dart'; import '../runner/flutter_command.dart';
diff --git a/packages/flutter_tools/lib/src/commands/build_fuchsia.dart b/packages/flutter_tools/lib/src/commands/build_fuchsia.dart index cd0b67b..e983386 100644 --- a/packages/flutter_tools/lib/src/commands/build_fuchsia.dart +++ b/packages/flutter_tools/lib/src/commands/build_fuchsia.dart
@@ -12,7 +12,7 @@ import '../features.dart'; import '../fuchsia/fuchsia_build.dart'; import '../fuchsia/fuchsia_pm.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../runner/flutter_command.dart' show FlutterCommandResult; import 'build.dart';
diff --git a/packages/flutter_tools/lib/src/commands/build_ios.dart b/packages/flutter_tools/lib/src/commands/build_ios.dart index 8402eb1..25d3349 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/utils.dart'; import '../build_info.dart'; import '../convert.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.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_ios_framework.dart b/packages/flutter_tools/lib/src/commands/build_ios_framework.dart index c6c1c02..b4fb207 100644 --- a/packages/flutter_tools/lib/src/commands/build_ios_framework.dart +++ b/packages/flutter_tools/lib/src/commands/build_ios_framework.dart
@@ -18,7 +18,7 @@ import '../build_system/targets/ios.dart'; import '../cache.dart'; import '../flutter_plugins.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../macos/cocoapod_utils.dart'; import '../project.dart'; import '../runner/flutter_command.dart' show DevelopmentArtifact, FlutterCommandResult;
diff --git a/packages/flutter_tools/lib/src/commands/build_linux.dart b/packages/flutter_tools/lib/src/commands/build_linux.dart index 5c65fb3..70fdf05 100644 --- a/packages/flutter_tools/lib/src/commands/build_linux.dart +++ b/packages/flutter_tools/lib/src/commands/build_linux.dart
@@ -12,7 +12,7 @@ import '../build_info.dart'; import '../cache.dart'; import '../features.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../linux/build_linux.dart'; import '../project.dart'; import '../runner/flutter_command.dart' show FlutterCommandResult;
diff --git a/packages/flutter_tools/lib/src/commands/build_macos.dart b/packages/flutter_tools/lib/src/commands/build_macos.dart index 161d005..e387c0e 100644 --- a/packages/flutter_tools/lib/src/commands/build_macos.dart +++ b/packages/flutter_tools/lib/src/commands/build_macos.dart
@@ -11,7 +11,7 @@ import '../build_info.dart'; import '../cache.dart'; import '../features.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../macos/build_macos.dart'; import '../project.dart'; import '../runner/flutter_command.dart' show FlutterCommandResult;
diff --git a/packages/flutter_tools/lib/src/commands/build_web.dart b/packages/flutter_tools/lib/src/commands/build_web.dart index 8cb8b06..0bf0c75 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 '../build_info.dart'; import '../build_system/targets/web.dart'; import '../features.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../runner/flutter_command.dart' show DevelopmentArtifact, FlutterCommandResult;
diff --git a/packages/flutter_tools/lib/src/commands/build_windows.dart b/packages/flutter_tools/lib/src/commands/build_windows.dart index 9b49270..91f58fa 100644 --- a/packages/flutter_tools/lib/src/commands/build_windows.dart +++ b/packages/flutter_tools/lib/src/commands/build_windows.dart
@@ -11,7 +11,7 @@ import '../build_info.dart'; import '../cache.dart'; import '../features.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../runner/flutter_command.dart' show FlutterCommandResult; import '../windows/build_windows.dart';
diff --git a/packages/flutter_tools/lib/src/commands/build_winuwp.dart b/packages/flutter_tools/lib/src/commands/build_winuwp.dart index c9801f5..84741c5 100644 --- a/packages/flutter_tools/lib/src/commands/build_winuwp.dart +++ b/packages/flutter_tools/lib/src/commands/build_winuwp.dart
@@ -10,7 +10,7 @@ import '../build_info.dart'; import '../cache.dart'; import '../features.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../runner/flutter_command.dart' show FlutterCommandResult; import '../windows/build_windows.dart';
diff --git a/packages/flutter_tools/lib/src/commands/channel.dart b/packages/flutter_tools/lib/src/commands/channel.dart index d404d57..332509b 100644 --- a/packages/flutter_tools/lib/src/commands/channel.dart +++ b/packages/flutter_tools/lib/src/commands/channel.dart
@@ -6,7 +6,7 @@ import '../base/common.dart'; import '../cache.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../runner/flutter_command.dart'; import '../version.dart';
diff --git a/packages/flutter_tools/lib/src/commands/clean.dart b/packages/flutter_tools/lib/src/commands/clean.dart index c41b8dd..ee80dd2 100644 --- a/packages/flutter_tools/lib/src/commands/clean.dart +++ b/packages/flutter_tools/lib/src/commands/clean.dart
@@ -9,7 +9,7 @@ import '../base/file_system.dart'; import '../base/logger.dart'; import '../build_info.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../ios/xcodeproj.dart'; import '../project.dart'; import '../runner/flutter_command.dart';
diff --git a/packages/flutter_tools/lib/src/commands/config.dart b/packages/flutter_tools/lib/src/commands/config.dart index 72f8fb6..e34db37 100644 --- a/packages/flutter_tools/lib/src/commands/config.dart +++ b/packages/flutter_tools/lib/src/commands/config.dart
@@ -7,7 +7,7 @@ import '../base/common.dart'; import '../convert.dart'; import '../features.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../reporting/reporting.dart'; import '../runner/flutter_command.dart';
diff --git a/packages/flutter_tools/lib/src/commands/create.dart b/packages/flutter_tools/lib/src/commands/create.dart index 86650c9..93e4d1b 100644 --- a/packages/flutter_tools/lib/src/commands/create.dart +++ b/packages/flutter_tools/lib/src/commands/create.dart
@@ -16,7 +16,7 @@ import '../features.dart'; import '../flutter_manifest.dart'; import '../flutter_project_metadata.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../ios/code_signing.dart'; import '../project.dart'; import '../reporting/reporting.dart';
diff --git a/packages/flutter_tools/lib/src/commands/create_base.dart b/packages/flutter_tools/lib/src/commands/create_base.dart index 89fb128..b10b4a0 100644 --- a/packages/flutter_tools/lib/src/commands/create_base.dart +++ b/packages/flutter_tools/lib/src/commands/create_base.dart
@@ -18,7 +18,7 @@ import '../dart/pub.dart'; import '../features.dart'; import '../flutter_project_metadata.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../runner/flutter_command.dart'; import '../template.dart';
diff --git a/packages/flutter_tools/lib/src/commands/daemon.dart b/packages/flutter_tools/lib/src/commands/daemon.dart index 8e636d3..252f730 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_port_forwarder.dart'; import '../emulator.dart'; import '../features.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../resident_runner.dart'; import '../run_cold.dart';
diff --git a/packages/flutter_tools/lib/src/commands/downgrade.dart b/packages/flutter_tools/lib/src/commands/downgrade.dart index c71df4a..cb5684d 100644 --- a/packages/flutter_tools/lib/src/commands/downgrade.dart +++ b/packages/flutter_tools/lib/src/commands/downgrade.dart
@@ -13,7 +13,7 @@ import '../base/process.dart'; import '../base/terminal.dart'; import '../cache.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../persistent_tool_state.dart'; import '../runner/flutter_command.dart'; import '../version.dart';
diff --git a/packages/flutter_tools/lib/src/commands/drive.dart b/packages/flutter_tools/lib/src/commands/drive.dart index 2084b79..4371f24 100644 --- a/packages/flutter_tools/lib/src/commands/drive.dart +++ b/packages/flutter_tools/lib/src/commands/drive.dart
@@ -20,7 +20,7 @@ import '../dart/package_map.dart'; import '../device.dart'; import '../drive/drive_service.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../resident_runner.dart'; import '../runner/flutter_command.dart' show FlutterCommandCategory, 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 7acb88b..35d735f 100644 --- a/packages/flutter_tools/lib/src/commands/format.dart +++ b/packages/flutter_tools/lib/src/commands/format.dart
@@ -9,7 +9,7 @@ import '../artifacts.dart'; import '../base/common.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../runner/flutter_command.dart'; class FormatCommand extends FlutterCommand {
diff --git a/packages/flutter_tools/lib/src/commands/generate.dart b/packages/flutter_tools/lib/src/commands/generate.dart index b78bdc2..a79aeef 100644 --- a/packages/flutter_tools/lib/src/commands/generate.dart +++ b/packages/flutter_tools/lib/src/commands/generate.dart
@@ -4,7 +4,7 @@ // @dart = 2.8 -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../runner/flutter_command.dart'; class GenerateCommand extends FlutterCommand {
diff --git a/packages/flutter_tools/lib/src/commands/generate_localizations.dart b/packages/flutter_tools/lib/src/commands/generate_localizations.dart index 66526a3..1998254 100644 --- a/packages/flutter_tools/lib/src/commands/generate_localizations.dart +++ b/packages/flutter_tools/lib/src/commands/generate_localizations.dart
@@ -7,7 +7,7 @@ import '../base/common.dart'; import '../base/file_system.dart'; import '../base/logger.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../localizations/gen_l10n.dart'; import '../localizations/gen_l10n_types.dart'; import '../localizations/localizations_utils.dart';
diff --git a/packages/flutter_tools/lib/src/commands/ide_config.dart b/packages/flutter_tools/lib/src/commands/ide_config.dart index 1cffcf8..5f40c44 100644 --- a/packages/flutter_tools/lib/src/commands/ide_config.dart +++ b/packages/flutter_tools/lib/src/commands/ide_config.dart
@@ -7,7 +7,7 @@ import '../base/common.dart'; import '../base/file_system.dart'; import '../cache.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../runner/flutter_command.dart'; import '../template.dart';
diff --git a/packages/flutter_tools/lib/src/commands/install.dart b/packages/flutter_tools/lib/src/commands/install.dart index 104cf48..37cb4e0 100644 --- a/packages/flutter_tools/lib/src/commands/install.dart +++ b/packages/flutter_tools/lib/src/commands/install.dart
@@ -9,7 +9,7 @@ import '../base/common.dart'; import '../base/io.dart'; import '../device.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../runner/flutter_command.dart'; class InstallCommand extends FlutterCommand with DeviceBasedDevelopmentArtifacts {
diff --git a/packages/flutter_tools/lib/src/commands/logs.dart b/packages/flutter_tools/lib/src/commands/logs.dart index 80733ef..486c1cd 100644 --- a/packages/flutter_tools/lib/src/commands/logs.dart +++ b/packages/flutter_tools/lib/src/commands/logs.dart
@@ -9,7 +9,7 @@ import '../base/common.dart'; import '../base/io.dart'; import '../device.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../runner/flutter_command.dart'; class LogsCommand extends FlutterCommand {
diff --git a/packages/flutter_tools/lib/src/commands/packages.dart b/packages/flutter_tools/lib/src/commands/packages.dart index 7797e90..71cc3aa 100644 --- a/packages/flutter_tools/lib/src/commands/packages.dart +++ b/packages/flutter_tools/lib/src/commands/packages.dart
@@ -14,7 +14,7 @@ import '../dart/generate_synthetic_packages.dart'; import '../dart/pub.dart'; import '../flutter_plugins.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../plugins.dart'; import '../project.dart'; import '../reporting/reporting.dart';
diff --git a/packages/flutter_tools/lib/src/commands/run.dart b/packages/flutter_tools/lib/src/commands/run.dart index 48d5dd8..d75bdee 100644 --- a/packages/flutter_tools/lib/src/commands/run.dart +++ b/packages/flutter_tools/lib/src/commands/run.dart
@@ -16,7 +16,7 @@ import '../build_info.dart'; import '../device.dart'; import '../features.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../reporting/reporting.dart'; import '../resident_runner.dart';
diff --git a/packages/flutter_tools/lib/src/commands/screenshot.dart b/packages/flutter_tools/lib/src/commands/screenshot.dart index 0f74191..195829b 100644 --- a/packages/flutter_tools/lib/src/commands/screenshot.dart +++ b/packages/flutter_tools/lib/src/commands/screenshot.dart
@@ -10,7 +10,7 @@ import '../base/file_system.dart'; import '../convert.dart'; import '../device.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../runner/flutter_command.dart'; import '../vmservice.dart';
diff --git a/packages/flutter_tools/lib/src/commands/shell_completion.dart b/packages/flutter_tools/lib/src/commands/shell_completion.dart index c06774b..f30cd6e 100644 --- a/packages/flutter_tools/lib/src/commands/shell_completion.dart +++ b/packages/flutter_tools/lib/src/commands/shell_completion.dart
@@ -8,7 +8,7 @@ import '../base/common.dart'; import '../base/file_system.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../runner/flutter_command.dart'; class ShellCompletionCommand extends FlutterCommand {
diff --git a/packages/flutter_tools/lib/src/commands/test.dart b/packages/flutter_tools/lib/src/commands/test.dart index fae2859..75df894 100644 --- a/packages/flutter_tools/lib/src/commands/test.dart +++ b/packages/flutter_tools/lib/src/commands/test.dart
@@ -15,7 +15,7 @@ import '../bundle_builder.dart'; import '../devfs.dart'; import '../device.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../runner/flutter_command.dart'; import '../test/coverage_collector.dart';
diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index 7c88c80..fadd79d 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart
@@ -16,7 +16,7 @@ import '../base/task_queue.dart'; import '../cache.dart'; import '../dart/pub.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../runner/flutter_command.dart'; /// Map from package name to package version, used to artificially pin a pub
diff --git a/packages/flutter_tools/lib/src/commands/upgrade.dart b/packages/flutter_tools/lib/src/commands/upgrade.dart index f67689d..b7c2ba6 100644 --- a/packages/flutter_tools/lib/src/commands/upgrade.dart +++ b/packages/flutter_tools/lib/src/commands/upgrade.dart
@@ -12,7 +12,7 @@ import '../base/process.dart'; import '../cache.dart'; import '../dart/pub.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../runner/flutter_command.dart'; import '../version.dart';
diff --git a/packages/flutter_tools/lib/src/context_runner.dart b/packages/flutter_tools/lib/src/context_runner.dart index 33ffa3c..463113a 100644 --- a/packages/flutter_tools/lib/src/context_runner.dart +++ b/packages/flutter_tools/lib/src/context_runner.dart
@@ -44,7 +44,7 @@ import 'fuchsia/fuchsia_device.dart' show FuchsiaDeviceTools; import 'fuchsia/fuchsia_sdk.dart' show FuchsiaSdk, FuchsiaArtifacts; import 'fuchsia/fuchsia_workflow.dart' show FuchsiaWorkflow, fuchsiaWorkflow; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; import 'ios/ios_workflow.dart'; import 'ios/iproxy.dart'; import 'ios/simulators.dart';
diff --git a/packages/flutter_tools/lib/src/doctor.dart b/packages/flutter_tools/lib/src/doctor.dart index 67f2eca..3a13436 100644 --- a/packages/flutter_tools/lib/src/doctor.dart +++ b/packages/flutter_tools/lib/src/doctor.dart
@@ -21,7 +21,7 @@ import 'doctor_validator.dart'; import 'features.dart'; import 'fuchsia/fuchsia_workflow.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.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/doctor_validator.dart b/packages/flutter_tools/lib/src/doctor_validator.dart index 6342758..93b0e9f 100644 --- a/packages/flutter_tools/lib/src/doctor_validator.dart +++ b/packages/flutter_tools/lib/src/doctor_validator.dart
@@ -6,7 +6,7 @@ import 'base/async_guard.dart'; import 'base/terminal.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; class ValidatorTask { ValidatorTask(this.validator, this.result);
diff --git a/packages/flutter_tools/lib/src/drive/web_driver_service.dart b/packages/flutter_tools/lib/src/drive/web_driver_service.dart index 22ab5de..fb59642 100644 --- a/packages/flutter_tools/lib/src/drive/web_driver_service.dart +++ b/packages/flutter_tools/lib/src/drive/web_driver_service.dart
@@ -19,7 +19,7 @@ import '../build_info.dart'; import '../convert.dart'; import '../device.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../resident_runner.dart'; import '../web/web_runner.dart';
diff --git a/packages/flutter_tools/lib/src/flutter_application_package.dart b/packages/flutter_tools/lib/src/flutter_application_package.dart index b4c2181..e3cdf03 100644 --- a/packages/flutter_tools/lib/src/flutter_application_package.dart +++ b/packages/flutter_tools/lib/src/flutter_application_package.dart
@@ -16,7 +16,7 @@ import 'base/user_messages.dart'; import 'build_info.dart'; import 'fuchsia/application_package.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; import 'ios/application_package.dart'; import 'linux/application_package.dart'; import 'macos/application_package.dart';
diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart index 9e29d5a..4b83dcf 100644 --- a/packages/flutter_tools/lib/src/flutter_cache.dart +++ b/packages/flutter_tools/lib/src/flutter_cache.dart
@@ -18,7 +18,7 @@ import 'cache.dart'; import 'dart/package_map.dart'; import 'dart/pub.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; /// An implementation of the [Cache] which provides all of Flutter's default artifacts. class FlutterCache extends Cache {
diff --git a/packages/flutter_tools/lib/src/flutter_plugins.dart b/packages/flutter_tools/lib/src/flutter_plugins.dart index d099e26..f711472 100644 --- a/packages/flutter_tools/lib/src/flutter_plugins.dart +++ b/packages/flutter_tools/lib/src/flutter_plugins.dart
@@ -20,7 +20,7 @@ import 'dart/language_version.dart'; import 'dart/package_map.dart'; import 'features.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; import 'platform_plugins.dart'; import 'plugins.dart'; import 'project.dart';
diff --git a/packages/flutter_tools/lib/src/fuchsia/application_package.dart b/packages/flutter_tools/lib/src/fuchsia/application_package.dart index fe0df61..4d41314 100644 --- a/packages/flutter_tools/lib/src/fuchsia/application_package.dart +++ b/packages/flutter_tools/lib/src/fuchsia/application_package.dart
@@ -5,7 +5,7 @@ import '../application_package.dart'; import '../base/file_system.dart'; import '../build_info.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; abstract class FuchsiaApp extends ApplicationPackage {
diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_build.dart index 875e395..3834bff 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 '../bundle_builder.dart'; import '../convert.dart'; import '../devfs.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import 'fuchsia_pm.dart';
diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_device.dart index 78e79c2..2e5d404 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 '../build_info.dart'; import '../device.dart'; import '../device_port_forwarder.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../vmservice.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 d8b0b45..f7731fb 100644 --- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart +++ b/packages/flutter_tools/lib/src/fuchsia/fuchsia_kernel_compiler.dart
@@ -8,7 +8,7 @@ import '../base/common.dart'; import '../base/logger.dart'; import '../build_info.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.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/fuchsia/fuchsia_pm.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart index 4ed9973..493dcee 100644 --- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart +++ b/packages/flutter_tools/lib/src/fuchsia/fuchsia_pm.dart
@@ -8,7 +8,7 @@ import '../base/net.dart'; import '../base/process.dart'; import '../convert.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import 'fuchsia_sdk.dart';
diff --git a/packages/flutter_tools/lib/src/fuchsia/fuchsia_sdk.dart b/packages/flutter_tools/lib/src/fuchsia/fuchsia_sdk.dart index 4f82861..dc09979 100644 --- a/packages/flutter_tools/lib/src/fuchsia/fuchsia_sdk.dart +++ b/packages/flutter_tools/lib/src/fuchsia/fuchsia_sdk.dart
@@ -9,7 +9,7 @@ import '../base/io.dart'; import '../base/platform.dart'; import '../convert.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import 'fuchsia_ffx.dart'; import 'fuchsia_kernel_compiler.dart';
diff --git a/packages/flutter_tools/lib/src/fuchsia/tiles_ctl.dart b/packages/flutter_tools/lib/src/fuchsia/tiles_ctl.dart index bcdb70d..190df58 100644 --- a/packages/flutter_tools/lib/src/fuchsia/tiles_ctl.dart +++ b/packages/flutter_tools/lib/src/fuchsia/tiles_ctl.dart
@@ -5,7 +5,7 @@ // @dart = 2.8 import '../base/process.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import 'fuchsia_device.dart';
diff --git a/packages/flutter_tools/lib/src/globals.dart b/packages/flutter_tools/lib/src/globals.dart index 61bd13c..34ed293 100644 --- a/packages/flutter_tools/lib/src/globals.dart +++ b/packages/flutter_tools/lib/src/globals.dart
@@ -2,6 +2,234 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// TODO(jmagman): Remove globals_null_migrated.dart, move into globals.dart. +import 'package:process/process.dart'; -export 'globals_null_migrated.dart'; +import 'android/android_sdk.dart'; +import 'android/android_studio.dart'; +import 'android/gradle_utils.dart'; +import 'artifacts.dart'; +import 'base/bot_detector.dart'; +import 'base/config.dart'; +import 'base/context.dart'; +import 'base/error_handling_io.dart'; +import 'base/file_system.dart'; +import 'base/io.dart'; +import 'base/logger.dart'; +import 'base/net.dart'; +import 'base/os.dart'; +import 'base/platform.dart'; +import 'base/process.dart'; +import 'base/signals.dart'; +import 'base/template.dart'; +import 'base/terminal.dart'; +import 'base/time.dart'; +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 'doctor.dart'; +import 'fuchsia/fuchsia_sdk.dart'; +import 'ios/ios_workflow.dart'; +import 'ios/plist_parser.dart'; +import 'ios/simulators.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'; +import 'reporting/crash_reporting.dart'; +import 'reporting/reporting.dart'; +import 'runner/local_engine.dart'; +import 'version.dart'; + +/// The flutter GitHub repository. +String get flutterGit => platform.environment['FLUTTER_GIT_URL'] ?? 'https://github.com/flutter/flutter.git'; + +Artifacts? get artifacts => context.get<Artifacts>(); +BuildSystem? get buildSystem => context.get<BuildSystem>(); +Cache get cache => context.get<Cache>()!; +CocoaPodsValidator? get cocoapodsValidator => context.get<CocoaPodsValidator>(); +Config get config => context.get<Config>()!; +CrashReporter? get crashReporter => context.get<CrashReporter>(); +DeviceManager? get deviceManager => context.get<DeviceManager>(); +Doctor? get doctor => context.get<Doctor>(); +HttpClientFactory? get httpClientFactory => context.get<HttpClientFactory>(); +IOSSimulatorUtils? get iosSimulatorUtils => context.get<IOSSimulatorUtils>(); +Logger get logger => context.get<Logger>()!; +OperatingSystemUtils get os => context.get<OperatingSystemUtils>()!; +Signals get signals => context.get<Signals>() ?? LocalSignals.instance; +AndroidStudio? get androidStudio => context.get<AndroidStudio>(); +AndroidSdk? get androidSdk => context.get<AndroidSdk>(); +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>(); + +PersistentToolState? get persistentToolState => PersistentToolState.instance; + +BotDetector get botDetector => context.get<BotDetector>() ?? _defaultBotDetector; +final BotDetector _defaultBotDetector = BotDetector( + httpClientFactory: context.get<HttpClientFactory>() ?? () => HttpClient(), + platform: platform, + persistentToolState: persistentToolState ?? PersistentToolState( + fileSystem: fs, + logger: logger, + platform: platform, + ), +); +Future<bool> get isRunningOnBot => botDetector.isRunningOnBot; + +/// Currently active implementation of the file system. +/// +/// By default it uses local disk-based implementation. Override this in tests +/// with [MemoryFileSystem]. +FileSystem get fs => ErrorHandlingFileSystem( + delegate: context.get<FileSystem>() ?? localFileSystem, + platform: platform, +); + +FileSystemUtils get fsUtils => context.get<FileSystemUtils>() ?? FileSystemUtils( + fileSystem: fs, + platform: platform, +); + +const ProcessManager _kLocalProcessManager = LocalProcessManager(); + +/// The active process manager. +ProcessManager get processManager => context.get<ProcessManager>() ?? _kLocalProcessManager; +ProcessUtils get processUtils => context.get<ProcessUtils>()!; + +const Platform _kLocalPlatform = LocalPlatform(); +Platform get platform => context.get<Platform>() ?? _kLocalPlatform; + +UserMessages get userMessages => context.get<UserMessages>()!; + +final OutputPreferences _default = OutputPreferences( + wrapText: stdio.hasTerminal, + showColor: platform.stdoutSupportsAnsi, + stdio: stdio, +); +OutputPreferences get outputPreferences => context.get<OutputPreferences>() ?? _default; + +/// The current system clock instance. +SystemClock get systemClock => context.get<SystemClock>() ?? _systemClock; +SystemClock _systemClock = const SystemClock(); + +ProcessInfo get processInfo => context.get<ProcessInfo>()!; + +/// Display an error level message to the user. Commands should use this if they +/// fail in some way. +/// +/// Set [emphasis] to true to make the output bold if it's supported. +/// Set [color] to a [TerminalColor] to color the output, if the logger +/// supports it. The [color] defaults to [TerminalColor.red]. +void printError( + String message, { + StackTrace? stackTrace, + bool? emphasis, + TerminalColor? color, + int? indent, + int? hangingIndent, + bool? wrap, + }) { + logger.printError( + message, + stackTrace: stackTrace, + emphasis: emphasis ?? false, + color: color, + indent: indent, + hangingIndent: hangingIndent, + wrap: wrap, + ); +} + +/// Display normal output of the command. This should be used for things like +/// progress messages, success messages, or just normal command output. +/// +/// Set `emphasis` to true to make the output bold if it's supported. +/// +/// Set `newline` to false to skip the trailing linefeed. +/// +/// If `indent` is provided, each line of the message will be prepended by the +/// specified number of whitespaces. +void printStatus( + String message, { + bool? emphasis, + bool? newline, + TerminalColor? color, + int? indent, + int? hangingIndent, + bool? wrap, + }) { + logger.printStatus( + message, + emphasis: emphasis ?? false, + color: color, + newline: newline ?? true, + indent: indent, + hangingIndent: hangingIndent, + wrap: wrap, + ); +} + +/// Use this for verbose tracing output. Users can turn this output on in order +/// to help diagnose issues with the toolchain or with their setup. +void printTrace(String message) => logger.printTrace(message); + +AnsiTerminal get terminal { + return context.get<AnsiTerminal>() ?? _defaultAnsiTerminal; +} + +final AnsiTerminal _defaultAnsiTerminal = AnsiTerminal( + stdio: stdio, + platform: platform, + now: DateTime.now(), +); + +/// The global Stdio wrapper. +Stdio get stdio => context.get<Stdio>() ?? (_stdioInstance ??= Stdio()); +Stdio? _stdioInstance; + +PlistParser get plistParser => context.get<PlistParser>() ?? ( + _plistInstance ??= PlistParser( + fileSystem: fs, + processManager: processManager, + logger: logger, + )); +PlistParser? _plistInstance; + +/// The global template renderer. +TemplateRenderer get templateRenderer => context.get<TemplateRenderer>()!; + +ShutdownHooks? get shutdownHooks => context.get<ShutdownHooks>(); + +// Unless we're in a test of this class's signal handling features, we must +// have only one instance created with the singleton LocalSignals instance +// and the catchable signals it considers to be fatal. +LocalFileSystem? _instance; +LocalFileSystem get localFileSystem => _instance ??= LocalFileSystem( + LocalSignals.instance, + Signals.defaultExitSignals, + shutdownHooks, +); + +/// Gradle utils in the current [AppContext]. +GradleUtils? get gradleUtils => context.get<GradleUtils>(); + +CocoaPods? get cocoaPods => context.get<CocoaPods>(); + +FlutterProjectFactory get projectFactory { + return context.get<FlutterProjectFactory>() ?? FlutterProjectFactory( + logger: logger, + fileSystem: fs, + ); +} + +CustomDevicesConfig get customDevicesConfig => context.get<CustomDevicesConfig>()!;
diff --git a/packages/flutter_tools/lib/src/ios/application_package.dart b/packages/flutter_tools/lib/src/ios/application_package.dart index ce97f97..1a3a50b 100644 --- a/packages/flutter_tools/lib/src/ios/application_package.dart +++ b/packages/flutter_tools/lib/src/ios/application_package.dart
@@ -5,7 +5,7 @@ import '../application_package.dart'; import '../base/file_system.dart'; import '../build_info.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../xcode_project.dart'; import 'plist_parser.dart';
diff --git a/packages/flutter_tools/lib/src/ios/bitcode.dart b/packages/flutter_tools/lib/src/ios/bitcode.dart index 8cbc785..3077fe3 100644 --- a/packages/flutter_tools/lib/src/ios/bitcode.dart +++ b/packages/flutter_tools/lib/src/ios/bitcode.dart
@@ -8,7 +8,7 @@ import '../base/process.dart'; import '../base/version.dart'; import '../build_info.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../macos/xcode.dart'; const bool kBitcodeEnabledDefault = false;
diff --git a/packages/flutter_tools/lib/src/ios/devices.dart b/packages/flutter_tools/lib/src/ios/devices.dart index 67f613a..b5cb08a 100644 --- a/packages/flutter_tools/lib/src/ios/devices.dart +++ b/packages/flutter_tools/lib/src/ios/devices.dart
@@ -19,7 +19,7 @@ import '../convert.dart'; import '../device.dart'; import '../device_port_forwarder.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../macos/xcdevice.dart'; import '../project.dart'; import '../protocol_discovery.dart';
diff --git a/packages/flutter_tools/lib/src/ios/ios_emulators.dart b/packages/flutter_tools/lib/src/ios/ios_emulators.dart index de9da80..08fe7af 100644 --- a/packages/flutter_tools/lib/src/ios/ios_emulators.dart +++ b/packages/flutter_tools/lib/src/ios/ios_emulators.dart
@@ -7,7 +7,7 @@ import '../base/process.dart'; import '../device.dart'; import '../emulator.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import 'simulators.dart'; class IOSEmulators extends EmulatorDiscovery {
diff --git a/packages/flutter_tools/lib/src/ios/mac.dart b/packages/flutter_tools/lib/src/ios/mac.dart index c2f2cca..1b467bc 100644 --- a/packages/flutter_tools/lib/src/ios/mac.dart +++ b/packages/flutter_tools/lib/src/ios/mac.dart
@@ -16,7 +16,7 @@ import '../build_info.dart'; import '../cache.dart'; import '../flutter_manifest.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../macos/cocoapod_utils.dart'; import '../macos/xcode.dart'; import '../project.dart';
diff --git a/packages/flutter_tools/lib/src/ios/simulators.dart b/packages/flutter_tools/lib/src/ios/simulators.dart index e054484..e4dd95b 100644 --- a/packages/flutter_tools/lib/src/ios/simulators.dart +++ b/packages/flutter_tools/lib/src/ios/simulators.dart
@@ -20,7 +20,7 @@ import '../devfs.dart'; import '../device.dart'; import '../device_port_forwarder.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../macos/xcode.dart'; import '../project.dart'; import '../protocol_discovery.dart';
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 2f7be52..ac89218 100644 --- a/packages/flutter_tools/lib/src/ios/xcode_build_settings.dart +++ b/packages/flutter_tools/lib/src/ios/xcode_build_settings.dart
@@ -7,7 +7,7 @@ import '../build_info.dart'; import '../cache.dart'; import '../flutter_manifest.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.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 7509154..36c3e4d 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 '../convert.dart'; import '../dart/package_map.dart'; import '../devfs.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../vmservice.dart'; import '../web/bootstrap.dart';
diff --git a/packages/flutter_tools/lib/src/linux/application_package.dart b/packages/flutter_tools/lib/src/linux/application_package.dart index 0f99299..918cf46 100644 --- a/packages/flutter_tools/lib/src/linux/application_package.dart +++ b/packages/flutter_tools/lib/src/linux/application_package.dart
@@ -7,7 +7,7 @@ import '../build_info.dart'; import '../cmake.dart'; import '../cmake_project.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; abstract class LinuxApp extends ApplicationPackage { LinuxApp({required String projectBundleId}) : super(id: projectBundleId);
diff --git a/packages/flutter_tools/lib/src/linux/build_linux.dart b/packages/flutter_tools/lib/src/linux/build_linux.dart index c5545e3..30828b3 100644 --- a/packages/flutter_tools/lib/src/linux/build_linux.dart +++ b/packages/flutter_tools/lib/src/linux/build_linux.dart
@@ -15,7 +15,7 @@ import '../cmake_project.dart'; import '../convert.dart'; import '../flutter_plugins.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../migrations/cmake_custom_command_migration.dart'; // Matches the following error and warning patterns:
diff --git a/packages/flutter_tools/lib/src/macos/application_package.dart b/packages/flutter_tools/lib/src/macos/application_package.dart index b528d72..cdae70d 100644 --- a/packages/flutter_tools/lib/src/macos/application_package.dart +++ b/packages/flutter_tools/lib/src/macos/application_package.dart
@@ -7,7 +7,7 @@ import '../base/io.dart'; import '../base/utils.dart'; import '../build_info.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../ios/plist_parser.dart'; import '../xcode_project.dart';
diff --git a/packages/flutter_tools/lib/src/macos/build_macos.dart b/packages/flutter_tools/lib/src/macos/build_macos.dart index 71887774..335f634 100644 --- a/packages/flutter_tools/lib/src/macos/build_macos.dart +++ b/packages/flutter_tools/lib/src/macos/build_macos.dart
@@ -9,7 +9,7 @@ import '../base/project_migrator.dart'; import '../build_info.dart'; import '../convert.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../ios/xcode_build_settings.dart'; import '../ios/xcodeproj.dart'; import '../project.dart';
diff --git a/packages/flutter_tools/lib/src/macos/cocoapod_utils.dart b/packages/flutter_tools/lib/src/macos/cocoapod_utils.dart index 930fc18..fdfd309 100644 --- a/packages/flutter_tools/lib/src/macos/cocoapod_utils.dart +++ b/packages/flutter_tools/lib/src/macos/cocoapod_utils.dart
@@ -6,7 +6,7 @@ import '../build_info.dart'; import '../cache.dart'; import '../flutter_plugins.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; /// For a given build, determines whether dependencies have changed since the
diff --git a/packages/flutter_tools/lib/src/macos/xcdevice.dart b/packages/flutter_tools/lib/src/macos/xcdevice.dart index dcd9d58..4184876 100644 --- a/packages/flutter_tools/lib/src/macos/xcdevice.dart +++ b/packages/flutter_tools/lib/src/macos/xcdevice.dart
@@ -15,7 +15,7 @@ import '../build_info.dart'; import '../cache.dart'; import '../convert.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../ios/devices.dart'; import '../ios/ios_deploy.dart'; import '../ios/iproxy.dart';
diff --git a/packages/flutter_tools/lib/src/project.dart b/packages/flutter_tools/lib/src/project.dart index 01bd45e..eb2ddcf 100644 --- a/packages/flutter_tools/lib/src/project.dart +++ b/packages/flutter_tools/lib/src/project.dart
@@ -18,7 +18,7 @@ import 'features.dart'; import 'flutter_manifest.dart'; import 'flutter_plugins.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; import 'platform_plugins.dart'; import 'template.dart'; import 'xcode_project.dart';
diff --git a/packages/flutter_tools/lib/src/reporting/reporting.dart b/packages/flutter_tools/lib/src/reporting/reporting.dart index 16fb3de..6047127 100644 --- a/packages/flutter_tools/lib/src/reporting/reporting.dart +++ b/packages/flutter_tools/lib/src/reporting/reporting.dart
@@ -18,7 +18,7 @@ import '../dart/language_version.dart'; import '../doctor_validator.dart'; import '../features.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../version.dart'; import 'first_run.dart';
diff --git a/packages/flutter_tools/lib/src/resident_runner.dart b/packages/flutter_tools/lib/src/resident_runner.dart index 04c9597..1d2065b 100644 --- a/packages/flutter_tools/lib/src/resident_runner.dart +++ b/packages/flutter_tools/lib/src/resident_runner.dart
@@ -35,7 +35,7 @@ import 'devfs.dart'; import 'device.dart'; import 'features.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; import 'project.dart'; import 'resident_devtools_handler.dart'; import 'run_cold.dart';
diff --git a/packages/flutter_tools/lib/src/run_cold.dart b/packages/flutter_tools/lib/src/run_cold.dart index 431ed5f..e13ef28 100644 --- a/packages/flutter_tools/lib/src/run_cold.dart +++ b/packages/flutter_tools/lib/src/run_cold.dart
@@ -13,7 +13,7 @@ import 'base/logger.dart'; import 'build_info.dart'; import 'device.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; import 'resident_devtools_handler.dart'; import 'resident_runner.dart'; import 'tracing.dart';
diff --git a/packages/flutter_tools/lib/src/run_hot.dart b/packages/flutter_tools/lib/src/run_hot.dart index 5563473..2b8c419 100644 --- a/packages/flutter_tools/lib/src/run_hot.dart +++ b/packages/flutter_tools/lib/src/run_hot.dart
@@ -25,7 +25,7 @@ import 'devfs.dart'; import 'device.dart'; import 'features.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; import 'project.dart'; import 'reporting/reporting.dart'; import 'resident_devtools_handler.dart';
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 595772d..4030bbe 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/utils.dart'; import '../cache.dart'; import '../convert.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../tester/flutter_tester.dart'; import '../web/web_device.dart';
diff --git a/packages/flutter_tools/lib/src/sksl_writer.dart b/packages/flutter_tools/lib/src/sksl_writer.dart index dac647e..6ac6e3d 100644 --- a/packages/flutter_tools/lib/src/sksl_writer.dart +++ b/packages/flutter_tools/lib/src/sksl_writer.dart
@@ -11,7 +11,7 @@ import 'build_info.dart'; import 'convert.dart'; import 'device.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; Future<String?> sharedSkSlWriter(Device device, Map<String, Object> data, { File? outputFile,
diff --git a/packages/flutter_tools/lib/src/test/coverage_collector.dart b/packages/flutter_tools/lib/src/test/coverage_collector.dart index 05b00c4..aaa4f03 100644 --- a/packages/flutter_tools/lib/src/test/coverage_collector.dart +++ b/packages/flutter_tools/lib/src/test/coverage_collector.dart
@@ -11,7 +11,7 @@ import '../base/file_system.dart'; import '../base/io.dart'; import '../base/process.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../vmservice.dart'; import 'test_device.dart';
diff --git a/packages/flutter_tools/lib/src/test/flutter_platform.dart b/packages/flutter_tools/lib/src/test/flutter_platform.dart index 267d088..7a1233e 100644 --- a/packages/flutter_tools/lib/src/test/flutter_platform.dart +++ b/packages/flutter_tools/lib/src/test/flutter_platform.dart
@@ -19,7 +19,7 @@ import '../convert.dart'; import '../dart/language_version.dart'; import '../device.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; import '../test/test_wrapper.dart';
diff --git a/packages/flutter_tools/lib/src/test/font_config_manager.dart b/packages/flutter_tools/lib/src/test/font_config_manager.dart index 77158d7..92d6415 100644 --- a/packages/flutter_tools/lib/src/test/font_config_manager.dart +++ b/packages/flutter_tools/lib/src/test/font_config_manager.dart
@@ -5,7 +5,7 @@ import 'dart:async'; import '../base/file_system.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; /// Manages a Font configuration that can be shared across multiple tests. class FontConfigManager {
diff --git a/packages/flutter_tools/lib/src/test/integration_test_device.dart b/packages/flutter_tools/lib/src/test/integration_test_device.dart index 5d7eec3..74feba4 100644 --- a/packages/flutter_tools/lib/src/test/integration_test_device.dart +++ b/packages/flutter_tools/lib/src/test/integration_test_device.dart
@@ -14,7 +14,7 @@ import '../base/common.dart'; import '../build_info.dart'; import '../device.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../vmservice.dart'; import 'test_device.dart';
diff --git a/packages/flutter_tools/lib/src/test/runner.dart b/packages/flutter_tools/lib/src/test/runner.dart index 532d41f..39ce06c 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/file_system.dart'; import '../base/io.dart'; import '../device.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.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 13a2404..66b60b4 100644 --- a/packages/flutter_tools/lib/src/test/test_compiler.dart +++ b/packages/flutter_tools/lib/src/test/test_compiler.dart
@@ -14,7 +14,7 @@ import '../bundle.dart'; import '../compile.dart'; import '../flutter_plugins.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../project.dart'; /// A request to the [TestCompiler] for recompilation.
diff --git a/packages/flutter_tools/lib/src/version.dart b/packages/flutter_tools/lib/src/version.dart index abfbfc9..d6927f4 100644 --- a/packages/flutter_tools/lib/src/version.dart +++ b/packages/flutter_tools/lib/src/version.dart
@@ -12,7 +12,7 @@ import 'base/time.dart'; import 'cache.dart'; import 'convert.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; const String _unknownFrameworkVersion = '0.0.0-unknown';
diff --git a/packages/flutter_tools/lib/src/web/compile.dart b/packages/flutter_tools/lib/src/web/compile.dart index aad0161..1a8cd8b 100644 --- a/packages/flutter_tools/lib/src/web/compile.dart +++ b/packages/flutter_tools/lib/src/web/compile.dart
@@ -13,7 +13,7 @@ import '../build_system/targets/web.dart'; import '../cache.dart'; import '../flutter_plugins.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../platform_plugins.dart'; import '../plugins.dart'; import '../project.dart';
diff --git a/packages/flutter_tools/lib/src/windows/application_package.dart b/packages/flutter_tools/lib/src/windows/application_package.dart index a1f74ad..2b1e193 100644 --- a/packages/flutter_tools/lib/src/windows/application_package.dart +++ b/packages/flutter_tools/lib/src/windows/application_package.dart
@@ -8,7 +8,7 @@ import '../build_info.dart'; import '../cmake.dart'; import '../cmake_project.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; abstract class WindowsApp extends ApplicationPackage { WindowsApp({required String projectBundleId}) : super(id: projectBundleId);
diff --git a/packages/flutter_tools/lib/src/windows/build_windows.dart b/packages/flutter_tools/lib/src/windows/build_windows.dart index fefa23f..8e5d7e2 100644 --- a/packages/flutter_tools/lib/src/windows/build_windows.dart +++ b/packages/flutter_tools/lib/src/windows/build_windows.dart
@@ -17,7 +17,7 @@ import '../cmake_project.dart'; import '../convert.dart'; import '../flutter_plugins.dart'; -import '../globals_null_migrated.dart' as globals; +import '../globals.dart' as globals; import '../migrations/cmake_custom_command_migration.dart'; import 'install_manifest.dart'; import 'visual_studio.dart';
diff --git a/packages/flutter_tools/lib/src/xcode_project.dart b/packages/flutter_tools/lib/src/xcode_project.dart index 1657a72..cd30e5c 100644 --- a/packages/flutter_tools/lib/src/xcode_project.dart +++ b/packages/flutter_tools/lib/src/xcode_project.dart
@@ -9,7 +9,7 @@ import 'build_info.dart'; import 'bundle.dart' as bundle; import 'flutter_plugins.dart'; -import 'globals_null_migrated.dart' as globals; +import 'globals.dart' as globals; import 'ios/code_signing.dart'; import 'ios/plist_parser.dart'; import 'ios/xcode_build_settings.dart' as xcode;
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 e77906a0..8a0620e 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/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_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:process/process.dart'; import '../../src/common.dart';
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/assemble_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/assemble_test.dart index 56caf3d..c29e76b 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/assemble_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/assemble_test.dart
@@ -14,7 +14,7 @@ import 'package:flutter_tools/src/commands/assemble.dart'; import 'package:flutter_tools/src/convert.dart'; import 'package:flutter_tools/src/features.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../../src/common.dart'; import '../../src/context.dart';
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart index 14151ce..33af827 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart
@@ -21,7 +21,7 @@ import 'package:flutter_tools/src/commands/attach.dart'; import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/device_port_forwarder.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/application_package.dart'; import 'package:flutter_tools/src/ios/devices.dart'; import 'package:flutter_tools/src/macos/macos_ipad_device.dart';
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/config_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/config_test.dart index 1796f46..25d9f04 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/config_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/config_test.dart
@@ -13,7 +13,7 @@ import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/config.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:flutter_tools/src/version.dart'; import 'package:test/fake.dart';
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/create_usage_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/create_usage_test.dart index 40f8a91..6b45a6d 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/create_usage_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/create_usage_test.dart
@@ -11,7 +11,7 @@ import 'package:flutter_tools/src/convert.dart'; import 'package:flutter_tools/src/doctor.dart'; import 'package:flutter_tools/src/doctor_validator.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../../src/context.dart'; import '../../src/test_flutter_command_runner.dart';
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart index 8499eb0..353c3dc 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart
@@ -23,7 +23,7 @@ import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/features.dart'; import 'package:flutter_tools/src/fuchsia/fuchsia_workflow.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/ios_workflow.dart'; import 'package:flutter_tools/src/resident_runner.dart'; import 'package:test/fake.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 4bb74d8..427f66c 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/cache.dart'; import 'package:flutter_tools/src/commands/devices.dart'; import 'package:flutter_tools/src/device.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../../src/common.dart'; import '../../src/context.dart';
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/doctor_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/doctor_test.dart index 936b97c..4c91a26 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/doctor_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/doctor_test.dart
@@ -30,7 +30,7 @@ import 'package:flutter_tools/src/doctor.dart'; import 'package:flutter_tools/src/doctor_validator.dart'; import 'package:flutter_tools/src/features.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:flutter_tools/src/version.dart'; import 'package:flutter_tools/src/vscode/vscode.dart';
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/ide_config_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/ide_config_test.dart index ebdd220..cdee1e2 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/ide_config_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/ide_config_test.dart
@@ -8,7 +8,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/ide_config.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/template.dart'; import '../../src/common.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 8a91686..96afec3 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/commands/run.dart'; import 'package:flutter_tools/src/devfs.dart'; import 'package:flutter_tools/src/device.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.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';
diff --git a/packages/flutter_tools/test/commands.shard/hermetic/shell_completion_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/shell_completion_test.dart index d2fda26..c71c3f2 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/shell_completion_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/shell_completion_test.dart
@@ -10,7 +10,7 @@ import 'package:flutter_tools/src/base/io.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/shell_completion.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../../src/context.dart'; import '../../src/fakes.dart';
diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart index 4685923..97f91ae 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_aar_test.dart
@@ -11,7 +11,7 @@ import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/build_aar.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/project.dart'; import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:meta/meta.dart';
diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_apk_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_apk_test.dart index af937bf..5217812 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_apk_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_apk_test.dart
@@ -11,7 +11,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/build_apk.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/project.dart'; import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:test/fake.dart';
diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_appbundle_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_appbundle_test.dart index 0abdec8..5b5b94a 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_appbundle_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_appbundle_test.dart
@@ -10,7 +10,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/build_appbundle.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/project.dart'; import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:test/fake.dart';
diff --git a/packages/flutter_tools/test/commands.shard/permeable/build_bundle_test.dart b/packages/flutter_tools/test/commands.shard/permeable/build_bundle_test.dart index de3aea4..450f2e9 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/build_bundle_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/build_bundle_test.dart
@@ -20,7 +20,7 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/build_bundle.dart'; import 'package:flutter_tools/src/features.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/project.dart'; import 'package:meta/meta.dart'; import 'package:test/fake.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 3c31a0b..fb3679a 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_base.dart'; import 'package:flutter_tools/src/dart/pub.dart'; import 'package:flutter_tools/src/features.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.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/commands.shard/permeable/format_test.dart b/packages/flutter_tools/test/commands.shard/permeable/format_test.dart index b8eb091..942dbd2 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/format_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/format_test.dart
@@ -8,7 +8,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/format.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../../src/common.dart'; import '../../src/context.dart';
diff --git a/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart b/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart index 95c5b0b..c4a3662 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/packages_test.dart
@@ -23,7 +23,7 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/packages.dart'; import 'package:flutter_tools/src/dart/pub.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../../src/common.dart'; import '../../src/context.dart';
diff --git a/packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart b/packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart index 745dcd0..4821d90 100644 --- a/packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart +++ b/packages/flutter_tools/test/commands.shard/permeable/upgrade_test.dart
@@ -10,7 +10,7 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/upgrade.dart'; import 'package:flutter_tools/src/convert.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/persistent_tool_state.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:flutter_tools/src/version.dart';
diff --git a/packages/flutter_tools/test/general.shard/analytics_test.dart b/packages/flutter_tools/test/general.shard/analytics_test.dart index cfb551f..2371d30 100644 --- a/packages/flutter_tools/test/general.shard/analytics_test.dart +++ b/packages/flutter_tools/test/general.shard/analytics_test.dart
@@ -18,7 +18,7 @@ import 'package:flutter_tools/src/commands/doctor.dart'; import 'package:flutter_tools/src/doctor.dart'; import 'package:flutter_tools/src/features.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:flutter_tools/src/version.dart';
diff --git a/packages/flutter_tools/test/general.shard/android/android_sdk_test.dart b/packages/flutter_tools/test/general.shard/android/android_sdk_test.dart index f9e8da8..35bcda4 100644 --- a/packages/flutter_tools/test/general.shard/android/android_sdk_test.dart +++ b/packages/flutter_tools/test/general.shard/android/android_sdk_test.dart
@@ -9,7 +9,7 @@ import 'package:flutter_tools/src/base/config.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/platform.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:meta/meta.dart'; import '../../src/common.dart';
diff --git a/packages/flutter_tools/test/general.shard/android/android_studio_test.dart b/packages/flutter_tools/test/general.shard/android/android_studio_test.dart index 787f2ec..c81f0c8 100644 --- a/packages/flutter_tools/test/general.shard/android/android_studio_test.dart +++ b/packages/flutter_tools/test/general.shard/android/android_studio_test.dart
@@ -9,7 +9,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/version.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/plist_parser.dart'; import 'package:test/fake.dart';
diff --git a/packages/flutter_tools/test/general.shard/android/android_studio_validator_test.dart b/packages/flutter_tools/test/general.shard/android/android_studio_validator_test.dart index e12eaac..975f439 100644 --- a/packages/flutter_tools/test/general.shard/android/android_studio_validator_test.dart +++ b/packages/flutter_tools/test/general.shard/android/android_studio_validator_test.dart
@@ -12,7 +12,7 @@ import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/user_messages.dart'; import 'package:flutter_tools/src/doctor_validator.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../../src/common.dart'; import '../../src/context.dart';
diff --git a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart index 8cb73cd..a0df724 100644 --- a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart +++ b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
@@ -12,7 +12,7 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/terminal.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/project.dart'; import '../../src/common.dart';
diff --git a/packages/flutter_tools/test/general.shard/android/gradle_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_test.dart index 7bd9322..d98c34d 100644 --- a/packages/flutter_tools/test/general.shard/android/gradle_test.dart +++ b/packages/flutter_tools/test/general.shard/android/gradle_test.dart
@@ -15,7 +15,7 @@ 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/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/project.dart'; import 'package:test/fake.dart';
diff --git a/packages/flutter_tools/test/general.shard/android/multidex_test.dart b/packages/flutter_tools/test/general.shard/android/multidex_test.dart index a4cc8e8..07627f1 100644 --- a/packages/flutter_tools/test/general.shard/android/multidex_test.dart +++ b/packages/flutter_tools/test/general.shard/android/multidex_test.dart
@@ -8,7 +8,7 @@ import 'package:file/memory.dart'; import 'package:flutter_tools/src/android/multidex.dart'; import 'package:flutter_tools/src/base/file_system.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../../src/common.dart'; import '../../src/context.dart';
diff --git a/packages/flutter_tools/test/general.shard/application_package_test.dart b/packages/flutter_tools/test/general.shard/application_package_test.dart index d0e0106..aaf2705 100644 --- a/packages/flutter_tools/test/general.shard/application_package_test.dart +++ b/packages/flutter_tools/test/general.shard/application_package_test.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/fuchsia/application_package.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/application_package.dart'; import 'package:flutter_tools/src/ios/plist_parser.dart'; import 'package:flutter_tools/src/project.dart';
diff --git a/packages/flutter_tools/test/general.shard/asset_bundle_package_fonts_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_package_fonts_test.dart index ac49c95..a312ea9 100644 --- a/packages/flutter_tools/test/general.shard/asset_bundle_package_fonts_test.dart +++ b/packages/flutter_tools/test/general.shard/asset_bundle_package_fonts_test.dart
@@ -12,7 +12,7 @@ import 'package:flutter_tools/src/asset.dart'; import 'package:flutter_tools/src/base/file_system.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../src/common.dart'; import '../src/context.dart';
diff --git a/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart index eec7eff..a733bd2 100644 --- a/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart +++ b/packages/flutter_tools/test/general.shard/asset_bundle_package_test.dart
@@ -12,7 +12,7 @@ import 'package:flutter_tools/src/asset.dart'; import 'package:flutter_tools/src/base/file_system.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../src/common.dart'; import '../src/context.dart';
diff --git a/packages/flutter_tools/test/general.shard/asset_bundle_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_test.dart index 45d9653..35f1c23 100644 --- a/packages/flutter_tools/test/general.shard/asset_bundle_test.dart +++ b/packages/flutter_tools/test/general.shard/asset_bundle_test.dart
@@ -13,7 +13,7 @@ import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/bundle_builder.dart'; import 'package:flutter_tools/src/devfs.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../src/common.dart'; import '../src/context.dart';
diff --git a/packages/flutter_tools/test/general.shard/asset_bundle_variant_test.dart b/packages/flutter_tools/test/general.shard/asset_bundle_variant_test.dart index a321d7d..7ae9dd1 100644 --- a/packages/flutter_tools/test/general.shard/asset_bundle_variant_test.dart +++ b/packages/flutter_tools/test/general.shard/asset_bundle_variant_test.dart
@@ -12,7 +12,7 @@ import 'package:flutter_tools/src/asset.dart'; import 'package:flutter_tools/src/base/file_system.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../src/common.dart'; import '../src/context.dart';
diff --git a/packages/flutter_tools/test/general.shard/asset_test.dart b/packages/flutter_tools/test/general.shard/asset_test.dart index 2b38745..0b13455 100644 --- a/packages/flutter_tools/test/general.shard/asset_test.dart +++ b/packages/flutter_tools/test/general.shard/asset_test.dart
@@ -7,7 +7,7 @@ import 'package:flutter_tools/src/asset.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../src/common.dart'; import '../src/context.dart';
diff --git a/packages/flutter_tools/test/general.shard/build_system/exceptions_test.dart b/packages/flutter_tools/test/general.shard/build_system/exceptions_test.dart index 52267e9..0a93587 100644 --- a/packages/flutter_tools/test/general.shard/build_system/exceptions_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/exceptions_test.dart
@@ -5,7 +5,7 @@ import 'package:flutter_tools/src/base/file_system.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_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.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 fe3d0ae..182a35b 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/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_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../../src/common.dart'; import '../../src/fake_process_manager.dart';
diff --git a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart index 2f9c5da..2313add 100644 --- a/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart +++ b/packages/flutter_tools/test/general.shard/build_system/targets/web_test.dart
@@ -12,7 +12,7 @@ import 'package:flutter_tools/src/build_system/build_system.dart'; import 'package:flutter_tools/src/build_system/depfile.dart'; import 'package:flutter_tools/src/build_system/targets/web.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../../../src/common.dart'; import '../../../src/fake_process_manager.dart';
diff --git a/packages/flutter_tools/test/general.shard/bundle_builder_test.dart b/packages/flutter_tools/test/general.shard/bundle_builder_test.dart index 56ae760..8c5f949 100644 --- a/packages/flutter_tools/test/general.shard/bundle_builder_test.dart +++ b/packages/flutter_tools/test/general.shard/bundle_builder_test.dart
@@ -11,7 +11,7 @@ import 'package:flutter_tools/src/build_system/build_system.dart'; import 'package:flutter_tools/src/bundle.dart'; import 'package:flutter_tools/src/bundle_builder.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/project.dart'; import '../src/common.dart';
diff --git a/packages/flutter_tools/test/general.shard/cache_test.dart b/packages/flutter_tools/test/general.shard/cache_test.dart index 24b3302..8d87ff1 100644 --- a/packages/flutter_tools/test/general.shard/cache_test.dart +++ b/packages/flutter_tools/test/general.shard/cache_test.dart
@@ -16,7 +16,7 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/dart/pub.dart'; import 'package:flutter_tools/src/flutter_cache.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:meta/meta.dart'; import 'package:test/fake.dart';
diff --git a/packages/flutter_tools/test/general.shard/channel_test.dart b/packages/flutter_tools/test/general.shard/channel_test.dart index d5cdbed..33d0552 100644 --- a/packages/flutter_tools/test/general.shard/channel_test.dart +++ b/packages/flutter_tools/test/general.shard/channel_test.dart
@@ -15,7 +15,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/channel.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/version.dart'; import '../src/common.dart';
diff --git a/packages/flutter_tools/test/general.shard/commands/build_test.dart b/packages/flutter_tools/test/general.shard/commands/build_test.dart index 17e661a..40dfce2 100644 --- a/packages/flutter_tools/test/general.shard/commands/build_test.dart +++ b/packages/flutter_tools/test/general.shard/commands/build_test.dart
@@ -19,7 +19,7 @@ import 'package:flutter_tools/src/commands/build_macos.dart'; import 'package:flutter_tools/src/commands/build_web.dart'; import 'package:flutter_tools/src/commands/build_windows.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/runner/flutter_command.dart'; import '../../src/common.dart';
diff --git a/packages/flutter_tools/test/general.shard/custom_devices/custom_device_test.dart b/packages/flutter_tools/test/general.shard/custom_devices/custom_device_test.dart index f1b8683..aedf545 100644 --- a/packages/flutter_tools/test/general.shard/custom_devices/custom_device_test.dart +++ b/packages/flutter_tools/test/general.shard/custom_devices/custom_device_test.dart
@@ -19,7 +19,7 @@ import 'package:flutter_tools/src/custom_devices/custom_device_config.dart'; import 'package:flutter_tools/src/custom_devices/custom_devices_config.dart'; import 'package:flutter_tools/src/device.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/linux/application_package.dart'; import 'package:flutter_tools/src/project.dart'; import 'package:meta/meta.dart';
diff --git a/packages/flutter_tools/test/general.shard/dart_plugin_test.dart b/packages/flutter_tools/test/general.shard/dart_plugin_test.dart index 7485a60..7d9d82f 100644 --- a/packages/flutter_tools/test/general.shard/dart_plugin_test.dart +++ b/packages/flutter_tools/test/general.shard/dart_plugin_test.dart
@@ -9,7 +9,7 @@ import 'package:flutter_tools/src/dart/package_map.dart'; import 'package:flutter_tools/src/flutter_manifest.dart'; import 'package:flutter_tools/src/flutter_plugins.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/plugins.dart'; import 'package:flutter_tools/src/project.dart'; import 'package:package_config/package_config.dart';
diff --git a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_start_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_start_test.dart index b590721..a395ab2 100644 --- a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_start_test.dart +++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_start_test.dart
@@ -25,7 +25,7 @@ import 'package:flutter_tools/src/fuchsia/pkgctl.dart'; import 'package:flutter_tools/src/fuchsia/session_control.dart'; import 'package:flutter_tools/src/fuchsia/tiles_ctl.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/project.dart'; import 'package:meta/meta.dart'; import 'package:test/fake.dart';
diff --git a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart index 31997d7..345555f 100644 --- a/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart +++ b/packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart
@@ -25,7 +25,7 @@ import 'package:flutter_tools/src/fuchsia/fuchsia_pm.dart'; import 'package:flutter_tools/src/fuchsia/fuchsia_sdk.dart'; import 'package:flutter_tools/src/fuchsia/fuchsia_workflow.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/project.dart'; import 'package:flutter_tools/src/vmservice.dart'; import 'package:meta/meta.dart';
diff --git a/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart b/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart index 0b72089..ef23d3b 100644 --- a/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/code_signing_test.dart
@@ -10,7 +10,7 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/terminal.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/code_signing.dart'; import '../../src/common.dart';
diff --git a/packages/flutter_tools/test/general.shard/ios/simulators_test.dart b/packages/flutter_tools/test/general.shard/ios/simulators_test.dart index 499a0d5..53b42ff 100644 --- a/packages/flutter_tools/test/general.shard/ios/simulators_test.dart +++ b/packages/flutter_tools/test/general.shard/ios/simulators_test.dart
@@ -14,7 +14,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/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/application_package.dart'; import 'package:flutter_tools/src/ios/plist_parser.dart'; import 'package:flutter_tools/src/ios/simulators.dart';
diff --git a/packages/flutter_tools/test/general.shard/macos/application_package_test.dart b/packages/flutter_tools/test/general.shard/macos/application_package_test.dart index 2f13bd3..69177b2 100644 --- a/packages/flutter_tools/test/general.shard/macos/application_package_test.dart +++ b/packages/flutter_tools/test/general.shard/macos/application_package_test.dart
@@ -12,7 +12,7 @@ import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/os.dart'; import 'package:flutter_tools/src/base/utils.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/plist_parser.dart'; import 'package:flutter_tools/src/macos/application_package.dart'; import 'package:flutter_tools/src/project.dart';
diff --git a/packages/flutter_tools/test/general.shard/plugins_test.dart b/packages/flutter_tools/test/general.shard/plugins_test.dart index f6ee05a..f98f823 100644 --- a/packages/flutter_tools/test/general.shard/plugins_test.dart +++ b/packages/flutter_tools/test/general.shard/plugins_test.dart
@@ -16,7 +16,7 @@ import 'package:flutter_tools/src/features.dart'; import 'package:flutter_tools/src/flutter_manifest.dart'; import 'package:flutter_tools/src/flutter_plugins.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/xcodeproj.dart'; import 'package:flutter_tools/src/plugins.dart'; import 'package:flutter_tools/src/project.dart';
diff --git a/packages/flutter_tools/test/general.shard/project_test.dart b/packages/flutter_tools/test/general.shard/project_test.dart index 066158c..ad36f83 100644 --- a/packages/flutter_tools/test/general.shard/project_test.dart +++ b/packages/flutter_tools/test/general.shard/project_test.dart
@@ -14,7 +14,7 @@ import 'package:flutter_tools/src/convert.dart'; import 'package:flutter_tools/src/features.dart'; import 'package:flutter_tools/src/flutter_manifest.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/plist_parser.dart'; import 'package:flutter_tools/src/ios/xcodeproj.dart'; import 'package:flutter_tools/src/project.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 f6adc3d..4386a4d 100644 --- a/packages/flutter_tools/test/general.shard/resident_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_runner_test.dart
@@ -26,7 +26,7 @@ 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_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.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/resident_web_runner_test.dart b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart index 4678173..f1cd3c5 100644 --- a/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/resident_web_runner_test.dart
@@ -22,7 +22,7 @@ import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/devfs.dart'; import 'package:flutter_tools/src/device.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/isolated/devfs_web.dart'; import 'package:flutter_tools/src/isolated/resident_web_runner.dart'; import 'package:flutter_tools/src/project.dart';
diff --git a/packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart b/packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart index e44b236..c9d8795 100644 --- a/packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart +++ b/packages/flutter_tools/test/general.shard/runner/flutter_command_runner_test.dart
@@ -11,7 +11,7 @@ import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/terminal.dart'; import 'package:flutter_tools/src/cache.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:flutter_tools/src/runner/flutter_command_runner.dart'; import 'package:flutter_tools/src/version.dart';
diff --git a/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart b/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart index e770c18..cbd94e9 100644 --- a/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart +++ b/packages/flutter_tools/test/general.shard/runner/flutter_command_test.dart
@@ -18,7 +18,7 @@ import 'package:flutter_tools/src/build_info.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/dart/pub.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:test/fake.dart';
diff --git a/packages/flutter_tools/test/general.shard/runner/runner_test.dart b/packages/flutter_tools/test/general.shard/runner/runner_test.dart index 457edc3..752ffd1 100644 --- a/packages/flutter_tools/test/general.shard/runner/runner_test.dart +++ b/packages/flutter_tools/test/general.shard/runner/runner_test.dart
@@ -15,7 +15,7 @@ import 'package:flutter_tools/src/base/platform.dart'; import 'package:flutter_tools/src/base/user_messages.dart'; import 'package:flutter_tools/src/cache.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/reporting/crash_reporting.dart'; import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:flutter_tools/src/runner/flutter_command.dart';
diff --git a/packages/flutter_tools/test/general.shard/testbed_test.dart b/packages/flutter_tools/test/general.shard/testbed_test.dart index 77f89cb..d34211d 100644 --- a/packages/flutter_tools/test/general.shard/testbed_test.dart +++ b/packages/flutter_tools/test/general.shard/testbed_test.dart
@@ -13,7 +13,7 @@ import 'package:flutter_tools/src/base/error_handling_io.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/process.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../src/common.dart'; import '../src/testbed.dart';
diff --git a/packages/flutter_tools/test/general.shard/version_test.dart b/packages/flutter_tools/test/general.shard/version_test.dart index ba1ef1c..9eede4b 100644 --- a/packages/flutter_tools/test/general.shard/version_test.dart +++ b/packages/flutter_tools/test/general.shard/version_test.dart
@@ -11,7 +11,7 @@ import 'package:flutter_tools/src/base/process.dart'; import 'package:flutter_tools/src/base/time.dart'; import 'package:flutter_tools/src/cache.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/version.dart'; import 'package:test/fake.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 af2e5d3..9dfd5aa 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_system/targets/web.dart'; import 'package:flutter_tools/src/compile.dart'; import 'package:flutter_tools/src/convert.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.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/general.shard/web/golden_comparator_process_test.dart b/packages/flutter_tools/test/general.shard/web/golden_comparator_process_test.dart index cab59d1..300747b 100644 --- a/packages/flutter_tools/test/general.shard/web/golden_comparator_process_test.dart +++ b/packages/flutter_tools/test/general.shard/web/golden_comparator_process_test.dart
@@ -8,7 +8,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/logger.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/test/flutter_web_goldens.dart'; import '../../src/common.dart';
diff --git a/packages/flutter_tools/test/integration.shard/debug_adapter/test_server.dart b/packages/flutter_tools/test/integration.shard/debug_adapter/test_server.dart index 59b6e9d..977eaf4 100644 --- a/packages/flutter_tools/test/integration.shard/debug_adapter/test_server.dart +++ b/packages/flutter_tools/test/integration.shard/debug_adapter/test_server.dart
@@ -9,7 +9,7 @@ import 'package:dds/src/dap/logging.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/debug_adapters/server.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; /// Enable to run from local source when running out-of-process (useful in /// development to avoid having to keep rebuilding the flutter tool).
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 7332f77..ee18d1c 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/cache.dart'; import 'package:flutter_tools/src/commands/create.dart'; import 'package:flutter_tools/src/dart/pub.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../src/common.dart'; import '../src/context.dart';
diff --git a/packages/flutter_tools/test/integration.shard/xcode_backend_test.dart b/packages/flutter_tools/test/integration.shard/xcode_backend_test.dart index 2aa55ba..c0fe24d 100644 --- a/packages/flutter_tools/test/integration.shard/xcode_backend_test.dart +++ b/packages/flutter_tools/test/integration.shard/xcode_backend_test.dart
@@ -8,7 +8,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/io.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import '../src/common.dart';
diff --git a/packages/flutter_tools/test/src/android_common.dart b/packages/flutter_tools/test/src/android_common.dart index 11bec77..4b4aa3a 100644 --- a/packages/flutter_tools/test/src/android_common.dart +++ b/packages/flutter_tools/test/src/android_common.dart
@@ -5,7 +5,7 @@ import 'package:flutter_tools/src/android/android_builder.dart'; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/build_info.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/project.dart'; /// A fake implementation of [AndroidBuilder].
diff --git a/packages/flutter_tools/test/src/common.dart b/packages/flutter_tools/test/src/common.dart index 6f0e311..60c9f75 100644 --- a/packages/flutter_tools/test/src/common.dart +++ b/packages/flutter_tools/test/src/common.dart
@@ -10,7 +10,7 @@ import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/io.dart'; import 'package:flutter_tools/src/base/platform.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:meta/meta.dart'; import 'package:path/path.dart' as path; // flutter_ignore: package_path_import import 'package:test_api/test_api.dart' as test_package show test; // ignore: deprecated_member_use
diff --git a/packages/flutter_tools/test/src/context.dart b/packages/flutter_tools/test/src/context.dart index 68ece0d..97ffb8a 100644 --- a/packages/flutter_tools/test/src/context.dart +++ b/packages/flutter_tools/test/src/context.dart
@@ -25,7 +25,7 @@ import 'package:flutter_tools/src/device.dart'; import 'package:flutter_tools/src/doctor.dart'; import 'package:flutter_tools/src/doctor_validator.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/ios/plist_parser.dart'; import 'package:flutter_tools/src/ios/simulators.dart'; import 'package:flutter_tools/src/ios/xcodeproj.dart';
diff --git a/packages/flutter_tools/test/src/pubspec_schema.dart b/packages/flutter_tools/test/src/pubspec_schema.dart index e2b18fa..be2aef5 100644 --- a/packages/flutter_tools/test/src/pubspec_schema.dart +++ b/packages/flutter_tools/test/src/pubspec_schema.dart
@@ -3,7 +3,7 @@ // found in the LICENSE file. import 'package:flutter_tools/src/flutter_manifest.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:yaml/yaml.dart'; import 'common.dart';
diff --git a/packages/flutter_tools/test/src/test_flutter_command_runner.dart b/packages/flutter_tools/test/src/test_flutter_command_runner.dart index 3080377..b8ad91f 100644 --- a/packages/flutter_tools/test/src/test_flutter_command_runner.dart +++ b/packages/flutter_tools/test/src/test_flutter_command_runner.dart
@@ -14,7 +14,7 @@ import 'package:flutter_tools/src/base/user_messages.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/commands/create.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/runner/flutter_command.dart'; import 'package:flutter_tools/src/runner/flutter_command_runner.dart';
diff --git a/packages/flutter_tools/test/src/testbed.dart b/packages/flutter_tools/test/src/testbed.dart index 710fe16..c470378 100644 --- a/packages/flutter_tools/test/src/testbed.dart +++ b/packages/flutter_tools/test/src/testbed.dart
@@ -18,7 +18,7 @@ import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/context_runner.dart'; import 'package:flutter_tools/src/dart/pub.dart'; -import 'package:flutter_tools/src/globals_null_migrated.dart' as globals; +import 'package:flutter_tools/src/globals.dart' as globals; import 'package:flutter_tools/src/reporting/reporting.dart'; import 'package:flutter_tools/src/version.dart';
diff --git a/packages/flutter_tools/tool/global_count.dart b/packages/flutter_tools/tool/global_count.dart index f8b8407..94ad246 100644 --- a/packages/flutter_tools/tool/global_count.dart +++ b/packages/flutter_tools/tool/global_count.dart
@@ -5,39 +5,32 @@ import 'dart:io'; import 'package:path/path.dart' as path; -/// Count the number of libraries that import globals_null_migrated.dart and globals.dart in lib and test. +/// Count the number of libraries that import globals.dart in lib and test. /// /// This must be run from the flutter_tools project root directory. void main() { final Directory sources = Directory(path.join(Directory.current.path, 'lib')); final Directory tests = Directory(path.join(Directory.current.path, 'test')); - countGlobalImports(sources); - countGlobalImports(tests); + final int sourceGlobals = countGlobalImports(sources); + final int testGlobals = countGlobalImports(tests); + print('lib/ contains $sourceGlobals libraries with global usage'); + print('test/ contains $testGlobals libraries with global usage'); } -final RegExp globalImport = RegExp(r"import.*(?:globals|globals_null_migrated)\.dart' as globals;"); -final RegExp globalNullUnsafeImport = RegExp("import.*globals.dart' as globals;"); +final RegExp globalImport = RegExp("import.*globals.dart' as globals;"); -void countGlobalImports(Directory directory) { +int countGlobalImports(Directory directory) { int count = 0; - int nullUnsafeImportCount = 0; for (final FileSystemEntity file in directory.listSync(recursive: true)) { if (!file.path.endsWith('.dart') || file is! File) { continue; } - final List<String> fileLines = file.readAsLinesSync(); - final bool hasImport = fileLines.any((String line) { + final bool hasImport = file.readAsLinesSync().any((String line) { return globalImport.hasMatch(line); }); if (hasImport) { count += 1; } - final bool hasUnsafeImport = fileLines.any((String line) { - return globalNullUnsafeImport.hasMatch(line); - }); - if (hasUnsafeImport) { - nullUnsafeImportCount += 1; - } } - print('${path.basename(directory.path)} contains $count libraries with global usage ($nullUnsafeImportCount unsafe)'); + return count; }