Remove globals_null_migrated.dart, move into globals.dart (#92948)

packages/flutter_tools/lib/runner.dart

@@ -19,7 +19,7 @@ import 'src/base/logger.dart';
 import 'src/base/process.dart';
 import 'src/context_runner.dart';
 import 'src/doctor.dart';
-import 'src/globals_null_migrated.dart' as globals;
+import 'src/globals.dart' as globals;
 import 'src/reporting/crash_reporting.dart';
 import 'src/runner/flutter_command.dart';
 import 'src/runner/flutter_command_runner.dart';

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

@@ -8,7 +8,7 @@ import '../base/common.dart';
 import '../base/utils.dart';
 import '../convert.dart';
 import '../device.dart';
-import '../globals_null_migrated.dart' as globals;
+import '../globals.dart' as globals;
 import '../runner/flutter_command.dart';
 
 class DevicesCommand extends FlutterCommand {

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

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

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

@@ -8,7 +8,7 @@ import '../base/common.dart';
 import '../base/utils.dart';
 import '../doctor_validator.dart';
 import '../emulator.dart';
-import '../globals_null_migrated.dart' as globals;
+import '../globals.dart' as globals;
 import '../runner/flutter_command.dart';
 
 class EmulatorsCommand extends FlutterCommand {

packages/flutter_tools/lib/src/globals_null_migrated.dart

@@ -1,235 +0,0 @@
-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'package:process/process.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>()!;

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

@@ -24,7 +24,7 @@ import '../dart/package_map.dart';
 import '../dart/pub.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 'flutter_command_runner.dart';