[tool] Migrate Desktop build subcommands and toolchain to modular dependency injection by bkonyi · Pull Request #190781 · flutter/flutter

bkonyi · 2026-08-08T05:23:49Z

Summary

Part 16 of the modular dependency injection migration.

Migrates Desktop build subcommands to modular constructor dependency injection:
- BuildWindowsCommand({required this.buildSystem, required ToolContext toolContext, required bool verboseHelp, required FeatureFlags featureFlags, required VisualStudio visualStudio})
- BuildLinuxCommand({required this.buildSystem, required ToolContext toolContext, required bool verboseHelp, required FeatureFlags featureFlags})
Eliminates _DefaultFeatureFlags and all constructor/ambient fallbacks, requiring explicit FeatureFlags, BuildSystem, and ToolContext.
Wires desktop build dependencies via ToolDependencies in executable.dart.
Migrates unit tests across test/commands.shard/hermetic/build_windows_test.dart and build_linux_test.dart to hermetic testWithoutContext.

…endency injection

gemini-code-assist

Code Review

This pull request refactors BuildCommand, BuildLinuxCommand, and BuildWindowsCommand to accept a ToolContext for dependency injection, reducing reliance on global context lookups. The associated tests are also updated to use new helper methods for command instantiation. The review feedback suggests further simplifying the code by removing redundant operatingSystemUtils parameters and fields that are already accessible via toolContext.os. Additionally, it is recommended to use effectivePlatform consistently in fallback instantiations and to avoid overriding the passed platform parameter with global context lookups.

…mmand

bkonyi · 2026-09-02T13:50:27Z

/gemini review

gemini-code-assist

Code Review

This pull request refactors the BuildCommand and its subcommands, BuildLinuxCommand and BuildWindowsCommand, to improve dependency injection by introducing ToolContext and FeatureFlags. The changes update constructors to accept these dependencies and provide fallback mechanisms, enhancing testability and modularity. Corresponding tests have been updated to reflect these architectural changes. The reviewer suggests further improving dependency injection by retrieving services such as PersistentToolState, HttpClientFactory, UserMessages, and Stdio from the context instead of hardcoding them.

…d subcommands

bkonyi · 2026-09-02T14:04:38Z

/gemini review

gemini-code-assist

Code Review

This pull request refactors BuildCommand and its subclasses to use ToolContext for dependency management, simplifying constructor logic and updating test suites accordingly. Review feedback suggests extracting complex initialization logic into factory methods, consolidating duplicate _DefaultFeatureFlags definitions, and centralizing test setup to improve maintainability.

…ck implementations

…text changes

…ack to context

…t.dart and fix directives ordering

…commands

flutter/flutter@b444e78...63b9518 2026-09-09 [email protected] Roll Packages from 9af9c60 to 36e088a (24 revisions) (flutter/flutter#192485) 2026-09-09 [email protected] Re-add Xcode and OpenJDK dependencies to macOS wasm local_engine builders (flutter/flutter#192238) 2026-09-09 [email protected] Roll Dart SDK from 77094991d1c1 to 4be1b711b4ba (5 revisions) (flutter/flutter#192453) 2026-09-09 [email protected] [material] Use super parameters in more places (flutter/flutter#192149) 2026-09-09 [email protected] [cupertino] Use super parameters in more places (flutter/flutter#192148) 2026-09-09 [email protected] [flutter_tools] Gracefully handle EROFS and write-protected file system errors (flutter/flutter#192431) 2026-09-09 [email protected] [tool] Migrate BuildIOSCommand and BuildIOSArchiveCommand to modular dependency injection (flutter/flutter#192250) 2026-09-09 [email protected] Replace more enum instances comparison to use `equality ==` instead of `identical` and update related tests (flutter/flutter#192229) 2026-09-09 [email protected] [web] Support local screenshot and golden testing in felt test (flutter/flutter#191318) 2026-09-09 [email protected] [tool] Migrate DaemonCommand and DebugAdapterCommand to modular dependency injection (flutter/flutter#190793) 2026-09-09 [email protected] [web] Support local golden testing in flutter test (flutter/flutter#191386) 2026-09-09 [email protected] [flutter_tools] Ignore widget previews outside lib/ during LSP code generation (flutter/flutter#192326) 2026-09-09 [email protected] [flutter_tools] Read package_config.json asynchronously in loadPackageConfigWithLogging (flutter/flutter#192443) 2026-09-08 [email protected] Add precacheTestImage to flutter_test and unskip web image tests (flutter/flutter#191435) 2026-09-08 [email protected] et: Fix compile_commands.json post-processing (flutter/flutter#192395) 2026-09-08 [email protected] Refactor createDebuggingOptions and option registrations to OptionDescriptor (flutter/flutter#192307) 2026-09-08 [email protected] [flutter_tools] Fix test separation between `VersionFreshnessValidator` and `FlutterVersion.checkFlutterVersionFreshness` (flutter/flutter#191593) 2026-09-08 [email protected] [tool] Migrate EmulatorsCommand to modular dependency injection (flutter/flutter#190769) 2026-09-08 [email protected] [tool] Migrate Desktop build subcommands and toolchain to modular dependency injection (flutter/flutter#190781) 2026-09-08 [email protected] [tool] Migrate Tooling and Analysis commands to modular dependency injection (flutter/flutter#190788) 2026-09-08 [email protected] Skip KGP version validation for AGP built-in Kotlin (flutter/flutter#192206) If this roll has caused a breakage, revert this CL and set the roller to dry run mode using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

…r#12814) flutter/flutter@b444e78...63b9518 2026-09-09 [email protected] Roll Packages from 9af9c60 to 36e088a (24 revisions) (flutter/flutter#192485) 2026-09-09 [email protected] Re-add Xcode and OpenJDK dependencies to macOS wasm local_engine builders (flutter/flutter#192238) 2026-09-09 [email protected] Roll Dart SDK from 77094991d1c1 to 4be1b711b4ba (5 revisions) (flutter/flutter#192453) 2026-09-09 [email protected] [material] Use super parameters in more places (flutter/flutter#192149) 2026-09-09 [email protected] [cupertino] Use super parameters in more places (flutter/flutter#192148) 2026-09-09 [email protected] [flutter_tools] Gracefully handle EROFS and write-protected file system errors (flutter/flutter#192431) 2026-09-09 [email protected] [tool] Migrate BuildIOSCommand and BuildIOSArchiveCommand to modular dependency injection (flutter/flutter#192250) 2026-09-09 [email protected] Replace more enum instances comparison to use `equality ==` instead of `identical` and update related tests (flutter/flutter#192229) 2026-09-09 [email protected] [web] Support local screenshot and golden testing in felt test (flutter/flutter#191318) 2026-09-09 [email protected] [tool] Migrate DaemonCommand and DebugAdapterCommand to modular dependency injection (flutter/flutter#190793) 2026-09-09 [email protected] [web] Support local golden testing in flutter test (flutter/flutter#191386) 2026-09-09 [email protected] [flutter_tools] Ignore widget previews outside lib/ during LSP code generation (flutter/flutter#192326) 2026-09-09 [email protected] [flutter_tools] Read package_config.json asynchronously in loadPackageConfigWithLogging (flutter/flutter#192443) 2026-09-08 [email protected] Add precacheTestImage to flutter_test and unskip web image tests (flutter/flutter#191435) 2026-09-08 [email protected] et: Fix compile_commands.json post-processing (flutter/flutter#192395) 2026-09-08 [email protected] Refactor createDebuggingOptions and option registrations to OptionDescriptor (flutter/flutter#192307) 2026-09-08 [email protected] [flutter_tools] Fix test separation between `VersionFreshnessValidator` and `FlutterVersion.checkFlutterVersionFreshness` (flutter/flutter#191593) 2026-09-08 [email protected] [tool] Migrate EmulatorsCommand to modular dependency injection (flutter/flutter#190769) 2026-09-08 [email protected] [tool] Migrate Desktop build subcommands and toolchain to modular dependency injection (flutter/flutter#190781) 2026-09-08 [email protected] [tool] Migrate Tooling and Analysis commands to modular dependency injection (flutter/flutter#190788) 2026-09-08 [email protected] Skip KGP version validation for AGP built-in Kotlin (flutter/flutter#192206) If this roll has caused a breakage, revert this CL and set the roller to dry run mode using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

bkonyi force-pushed the di/16-desktop-build-and-toolchain branch 6 times, most recently from b4d1727 to 6a55c06 Compare August 12, 2026 18:39

[tool] Migrate Desktop build subcommands and toolchain to modular dep…

541ae40

…endency injection

bkonyi force-pushed the di/16-desktop-build-and-toolchain branch from 6a55c06 to 541ae40 Compare September 2, 2026 13:23

bkonyi marked this pull request as ready for review September 2, 2026 13:23

bkonyi requested review from a team as code owners September 2, 2026 13:23

bkonyi added the CICD Run CI/CD label Sep 2, 2026

github-actions Bot removed team-android Owned by Android platform team team-ios Owned by iOS platform team team-macos Owned by the macOS platform team labels Sep 2, 2026

gemini-code-assist Bot reviewed Sep 2, 2026

View reviewed changes

bkonyi added 2 commits September 2, 2026 13:36

[tool] Eliminate variable mirroring without null promotion in BuildCo…

fc4d4c3

…mmand

[tool] Address code review feedback on Desktop build commands

642ece4

gemini-code-assist Bot reviewed Sep 2, 2026

View reviewed changes

[tool] Clean up platform and toolContext fallbacks in BuildCommand an…

c67c609

…d subcommands

gemini-code-assist Bot reviewed Sep 2, 2026

View reviewed changes

Comment thread packages/flutter_tools/lib/src/commands/build.dart Outdated

Comment thread packages/flutter_tools/lib/src/commands/build_windows.dart Outdated

Comment thread packages/flutter_tools/test/general.shard/windows/build_windows_flavor_test.dart

[tool] Require explicit toolContext in BuildCommand and remove fallba…

966b238

…ck implementations

bkonyi requested review from a team as code owners September 2, 2026 16:53

github-actions Bot added team-ios Owned by iOS platform team team-macos Owned by the macOS platform team labels Sep 2, 2026

bkonyi added 2 commits September 2, 2026 17:14

[tool] Pass non-nullable analytics and featureFlags in BuildCommand

794c921

[tool] Fix BuildCommand parameter signature and revert unintended con…

ac96b9d

…text changes

bkonyi removed request for a team September 2, 2026 17:42

bkonyi added 5 commits September 2, 2026 17:53

[tool] Remove trailing whitespace in build command tests

e068f56

[tool] Wire featureFlags to BuildCommand in executable.dart and fallb…

03351c1

…ack to context

[tool] Require non-nullable contexts in desktop build commands

55f853c

[tool] Fix BuildWindowsCommand parameters in build_windows_flavor_tes…

a0a714e

…t.dart and fix directives ordering

[tool] Eliminate fallbacks and _DefaultFeatureFlags in desktop build …

27f8aa4

…commands

LongCatIsLooong requested review from okorohelijah and vashworth September 3, 2026 21:37

[tool] Merge upstream master into di/16-desktop-build-and-toolchain

c1716ae

bkonyi requested a review from chingjun September 5, 2026 02:15

chingjun approved these changes Sep 8, 2026

View reviewed changes

bkonyi added the autosubmit Merge PR when tree becomes green via auto submit App label Sep 8, 2026

auto-submit Bot added this pull request to the merge queue Sep 8, 2026

Merged via the queue into flutter:master with commit cb1e225 Sep 8, 2026
23 checks passed

flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Sep 8, 2026

This was referenced Sep 9, 2026

Roll Flutter from b444e7897e24 to 0056d8b88d34 (19 revisions) flutter/packages#12813

Closed

Roll Flutter from b444e7897e24 to 63b9518f16bc (21 revisions) flutter/packages#12814

Merged

bkonyi mentioned this pull request Sep 9, 2026

[tool] Migrate BuildMacosCommand to modular dependency injection #192251

Closed

Conversation

bkonyi commented Aug 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bkonyi commented Sep 2, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bkonyi commented Sep 2, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

bkonyi commented Aug 8, 2026 •

edited

Loading