Revert: [flutter_tools] Remove globals from macOS build, migration, and Xcode project by flutteractionsbot · Pull Request #195535 · flutter/flutter

flutteractionsbot · 2026-10-28T22:22:42Z

Reverts: [flutter_tools] Remove globals from macOS build, migration, and Xcode project

Reason for reverting: ```

Original PR Author: @bkonyi

The original PR description is provided below:

Migrates macOS build utilities, XcodeProjectInterpreter, IosProject, MacOSProject, and XcodeProjectMigration away from globals.dart to explicit dependency injection via ToolContext.

Part of #47161

Pre-launch Checklist

I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
I read the [Tree Hygiene] wiki page, which explains my responsibilities.
I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
I signed the [CLA].
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is [test-exempt].
All existing and new tests are passing.

…nd Xcode project (flutter#193652)" This reverts commit 6da6a9b.

flutter-dashboard · 2026-10-28T22:25:28Z

Detected the emergency label.

If you add the autosubmit label, the bot will wait until all presubmits pass but ignore the tree status, allowing fixes for tree breakages while still validating that they don't break any existing presubmits.

The "Merge" button is also unlocked. To bypass presubmits as well as the tree status, press the GitHub "Add to Merge Queue".

gemini-code-assist

Code Review

This pull request refactors the flutter_tools package to remove the AppleContext dependency from several classes, including BuildMacosCommand, MacOSDevice, and SwiftPackageManagerIntegrationMigration. It introduces a more direct usage of globals for dependencies like logger, fileSystem, and plistParser to simplify dependency injection. Additionally, it updates the FlutterProjectFactory constructor and its usage across the codebase. Several critical issues were identified regarding constructor parameter naming and inconsistent use of local variables versus global accessors.

gemini-code-assist · 2026-10-28T22:25:30Z

 /// A wrapper around the `flutter` section in the `pubspec.yaml` file.
 class FlutterManifest {
-  FlutterManifest._({required this.logger});
+  FlutterManifest._({required this._logger});


Changing the constructor parameter to this._logger makes the named parameter _logger instead of logger. This causes a compile-time error in the redirecting factory constructor FlutterManifest.empty (which expects logger) and in the constructor invocation at line 86 (FlutterManifest._(logger: _logger)). To fix this, define the constructor parameter as logger and initialize the private field _logger in the initializer list.

FlutterManifest._({required Logger logger}) : _logger = logger;

gemini-code-assist · 2026-10-28T22:25:30Z

-    this._xcodeProjectInterpreter,
-    this._xcodeProjectInterpreterBuilder,
-  });
+  FlutterProjectFactory({required this._logger, required this._fileSystem, this._config});


Changing the constructor parameters to this._logger and this._fileSystem makes the named parameters _logger and _fileSystem instead of logger and fileSystem. This breaks every single instantiation of FlutterProjectFactory across the codebase (including in globals.dart, tool_dependencies.dart, and numerous tests) with compile-time errors. To fix this, define the constructor with public parameter names logger and fileSystem, and initialize the private fields in the initializer list.

Suggested change

FlutterProjectFactory({required this._logger, required this._fileSystem, this._config});

FlutterProjectFactory({

required Logger logger,

required FileSystem fileSystem,

Config? config,

}) : _logger = logger,

_fileSystem = fileSystem,

_config = config;

gemini-code-assist · 2026-10-28T22:25:30Z

+      fileSystem: globals.fs,
+      plistParser: globals.plistParser,
+      config: globals.config,


Since fs and config are already destructured from toolContext at the beginning of buildMacOS (line 93), we should consistently use these local variables instead of falling back to globals.fs and globals.config.

Suggested change

fileSystem: globals.fs,

plistParser: globals.plistParser,

config: globals.config,

fileSystem: fs,

plistParser: globals.plistParser,

config: config,

gemini-code-assist · 2026-10-28T22:25:30Z

-    logger: logger,
-    cocoapods: cocoaPods,
-    analytics: analytics,
+    fileSystem: globals.fs,


Use the destructured local variable fs instead of globals.fs for consistency.

Suggested change

fileSystem: globals.fs,

fileSystem: fs,

gemini-code-assist · 2026-10-28T22:25:30Z

  // regardless of the project name so long as there is exactly one project.
  final String? xcodeProjectName = xcodeProject.existsSync() ? xcodeProject.basename : null;
-  final XcodeProjectInfo? projectInfo = await xcodeProjectInterpreter.getInfo(
+  final XcodeProjectInfo? projectInfo = await globals.xcodeProjectInterpreter?.getInfo(


Since globals.xcodeProjectInterpreter is checked for null and guaranteed to be non-null at line 103, use ! instead of ?. to be consistent with other usages in this file.

Suggested change

final XcodeProjectInfo? projectInfo = await globals.xcodeProjectInterpreter?.getInfo(

final XcodeProjectInfo? projectInfo = await globals.xcodeProjectInterpreter!.getInfo(

gemini-code-assist · 2026-10-28T22:25:31Z

        .fetchDependenciesAndGenerateXcodebuildArgs(
          flutterProject.macos,
-          fs.directory(buildDirectoryPath),
+          globals.fs.directory(buildDirectoryPath),


Use the destructured local variable fs instead of globals.fs for consistency.

Suggested change

globals.fs.directory(buildDirectoryPath),

fs.directory(buildDirectoryPath),

gemini-code-assist · 2026-10-28T22:25:31Z

+        'OBJROOT=${globals.fs.path.join(flutterBuildDir.absolute.path, 'Build', 'Intermediates.noindex')}',
+        'SYMROOT=${globals.fs.path.join(flutterBuildDir.absolute.path, 'Build', 'Products')}',


Use the destructured local variable fs instead of globals.fs for consistency.

Suggested change

'OBJROOT=${globals.fs.path.join(flutterBuildDir.absolute.path, 'Build', 'Intermediates.noindex')}',

'SYMROOT=${globals.fs.path.join(flutterBuildDir.absolute.path, 'Build', 'Products')}',

'OBJROOT=${fs.path.join(flutterBuildDir.absolute.path, 'Build', 'Intermediates.noindex')}',

'SYMROOT=${fs.path.join(flutterBuildDir.absolute.path, 'Build', 'Products')}',

gemini-code-assist · 2026-10-28T22:25:31Z

  final File? aotSnapshot = const <CpuArch>[CpuArch.armv7, CpuArch.arm64, CpuArch.x64]
      .map<File?>((CpuArch arch) {
-        return fileSystem
+        return globals.fs


Use the destructured local variable fs instead of globals.fs for consistency within _writeCodeSizeAnalysis.

Suggested change

return globals.fs

return fs

gemini-code-assist · 2026-10-28T22:25:31Z

  final File? precompilerTrace = const <CpuArch>[CpuArch.armv7, CpuArch.arm64, CpuArch.x64]
      .map<File?>((CpuArch arch) {
-        return fileSystem
+        return globals.fs


Use the destructured local variable fs instead of globals.fs for consistency within _writeCodeSizeAnalysis.

Suggested change

return globals.fs

return fs

gemini-code-assist · 2026-10-28T22:25:31Z

    Directory directory,
  ) {
-    return fileSystem.path.extension(directory.path) == '.app';
+    return globals.fs.path.extension(directory.path) == '.app';


Use the destructured local variable fs instead of globals.fs for consistency within _writeCodeSizeAnalysis.

Suggested change

return globals.fs.path.extension(directory.path) == '.app';

return fs.path.extension(directory.path) == '.app';

Revert "[flutter_tools] Remove globals from macOS build, migration, a…

7f272fc

…nd Xcode project (flutter#193652)" This reverts commit 6da6a9b.

flutteractionsbot requested a review from a team as a code owner October 28, 2026 22:22

flutteractionsbot mentioned this pull request Oct 28, 2026

[flutter_tools] Remove globals from macOS build, migration, and Xcode project #193652

Merged

8 tasks done

flutter-dashboard Bot added the CICD Run CI/CD label Oct 28, 2026

flutteractionsbot requested a review from a team as a code owner October 28, 2026 22:22

jtmcdole added the emergency Jump the queue; land PR in front of all others; only use for emergencies label Oct 28, 2026

gemini-code-assist Bot reviewed Oct 28, 2026

View reviewed changes

jtmcdole approved these changes Oct 28, 2026

View reviewed changes

bkonyi self-requested a review October 28, 2026 22:57

bkonyi approved these changes Oct 28, 2026

View reviewed changes

jtmcdole added this pull request to the merge queue Oct 28, 2026

tarrinneal mentioned this pull request Oct 29, 2026

[flutter_tools] Compilation failure in build_macos.dart: Undefined name 'globals' after #193652 #195548

Closed

Merged via the queue into flutter:master with commit 8bf6f10 Oct 29, 2026
27 of 28 checks passed

flutteractionsbot deleted the revert-193652-1793226157 branch October 29, 2026 02:09

bkonyi mentioned this pull request Oct 29, 2026

Reland "[flutter_tools] Remove globals from macOS build, migration, and Xcode project" #195552

Merged

9 tasks done

This was referenced Oct 29, 2026

Roll Flutter from 0c2473cd50c8 to 2d7c54c7bd97 (19 revisions) flutter/packages#13489

Closed

Roll Flutter from 0c2473cd50c8 to 24fc85b33163 (20 revisions) flutter/packages#13490

Closed

Navigation Menu

Repository navigation

Revert: [flutter_tools] Remove globals from macOS build, migration, and Xcode project - #195535

Revert: [flutter_tools] Remove globals from macOS build, migration, and Xcode project#195535
jtmcdole merged 1 commit into
flutter:masterfrom
flutteractionsbot:revert-193652-1793226157

flutteractionsbot commented Oct 28, 2026

Uh oh!

flutter-dashboard Bot commented Oct 28, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

-  FlutterProjectFactory({required this._logger, required this._fileSystem, this._config});
+  FlutterProjectFactory({
+    required Logger logger,
+    required FileSystem fileSystem,
+    Config? config,
+  }) : _logger = logger,
+       _fileSystem = fileSystem,
+       _config = config;

	final XcodeProjectInfo? projectInfo = await globals.xcodeProjectInterpreter?.getInfo(
	final XcodeProjectInfo? projectInfo = await globals.xcodeProjectInterpreter!.getInfo(

	globals.fs.directory(buildDirectoryPath),
	fs.directory(buildDirectoryPath),

		'OBJROOT=${globals.fs.path.join(flutterBuildDir.absolute.path, 'Build', 'Intermediates.noindex')}',
		'SYMROOT=${globals.fs.path.join(flutterBuildDir.absolute.path, 'Build', 'Products')}',

	return globals.fs.path.extension(directory.path) == '.app';
	return fs.path.extension(directory.path) == '.app';

Conversation

flutteractionsbot commented Oct 28, 2026

Pre-launch Checklist

Uh oh!

flutter-dashboard Bot commented Oct 28, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Oct 28, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants