[flutter_tools] Ensure that global variables are easily identifiable (#47398)
diff --git a/packages/flutter_tools/lib/src/windows/build_windows.dart b/packages/flutter_tools/lib/src/windows/build_windows.dart index 2f0644f..55e4b77 100644 --- a/packages/flutter_tools/lib/src/windows/build_windows.dart +++ b/packages/flutter_tools/lib/src/windows/build_windows.dart
@@ -4,12 +4,11 @@ import '../artifacts.dart'; import '../base/common.dart'; -import '../base/file_system.dart'; import '../base/logger.dart'; import '../base/process.dart'; import '../build_info.dart'; import '../cache.dart'; -import '../globals.dart'; +import '../globals.dart' as globals; import '../project.dart'; import '../reporting/reporting.dart'; import 'msbuild_utils.dart'; @@ -26,11 +25,11 @@ if (target != null) { environment['FLUTTER_TARGET'] = target; } - if (artifacts is LocalEngineArtifacts) { - final LocalEngineArtifacts localEngineArtifacts = artifacts as LocalEngineArtifacts; + if (globals.artifacts is LocalEngineArtifacts) { + final LocalEngineArtifacts localEngineArtifacts = globals.artifacts as LocalEngineArtifacts; final String engineOutPath = localEngineArtifacts.engineOutPath; - environment['FLUTTER_ENGINE'] = fs.path.dirname(fs.path.dirname(engineOutPath)); - environment['LOCAL_ENGINE'] = fs.path.basename(engineOutPath); + environment['FLUTTER_ENGINE'] = globals.fs.path.dirname(globals.fs.path.dirname(engineOutPath)); + environment['LOCAL_ENGINE'] = globals.fs.path.basename(engineOutPath); } writePropertySheet(windowsProject.generatedPropertySheetFile, environment); @@ -42,14 +41,14 @@ if (!buildInfo.isDebug) { const String warning = '🚧 '; - printStatus(warning * 20); - printStatus('Warning: Only debug is currently implemented for Windows. This is effectively a debug build.'); - printStatus('See https://github.com/flutter/flutter/issues/38477 for details and updates.'); - printStatus(warning * 20); - printStatus(''); + globals.printStatus(warning * 20); + globals.printStatus('Warning: Only debug is currently implemented for Windows. This is effectively a debug build.'); + globals.printStatus('See https://github.com/flutter/flutter/issues/38477 for details and updates.'); + globals.printStatus(warning * 20); + globals.printStatus(''); } - final String buildScript = fs.path.join( + final String buildScript = globals.fs.path.join( Cache.flutterRoot, 'packages', 'flutter_tools', @@ -60,7 +59,7 @@ final String configuration = buildInfo.isDebug ? 'Debug' : 'Release'; final String solutionPath = windowsProject.solutionFile.path; final Stopwatch sw = Stopwatch()..start(); - final Status status = logger.startProgress( + final Status status = globals.logger.startProgress( 'Building Windows application...', timeout: null, ); @@ -72,9 +71,9 @@ result = await processUtils.stream(<String>[ buildScript, vcvarsScript, - fs.path.basename(solutionPath), + globals.fs.path.basename(solutionPath), configuration, - ], workingDirectory: fs.path.dirname(solutionPath), trace: true); + ], workingDirectory: globals.fs.path.dirname(solutionPath), trace: true); } finally { status.cancel(); }