[tool] Migrate ConfigCommand to modular dependency injection by bkonyi · Pull Request #190743 · flutter/flutter

bkonyi · 2026-08-07T20:57:26Z

Summary

Part 4 of the modular dependency injection migration.

Migrates ConfigCommand to explicit constructor dependency injection via ToolContext and AndroidStudio, removing ambient access from FlutterCommand and adding hermetic unit tests.

Part of #47161

gemini-code-assist

Code Review

This pull request refactors dependency management in flutter_tools by introducing structured context classes (ToolDependencies, ToolContext, AndroidContext, and AppleContext) to replace global references in commands like CleanCommand and ConfigCommand. Feedback from the review focuses on enhancing test hermeticity by adding explicit context overrides in dependency injection tests, simplifying ConfigCommand by making FeatureFlags and Analytics required parameters, and improving ToolDependencies by using the mockable system clock and reusing the resolved shutdown hooks.

…ners

…ired non-nullable contexts

# Conflicts: # packages/flutter_tools/lib/src/context/tool_dependencies.dart # packages/flutter_tools/test/general.shard/context/dependency_injection_test.dart

…ection

… globals fallback

…ctly in FlutterCommandRunner

gemini-code-assist

Code Review

This pull request refactors flutter_tools to migrate commands like CleanCommand and ConfigCommand toward explicit dependency injection using ToolContext instead of relying on global variables, updating the command runner and tests accordingly. The review feedback highlights a potential regression in FlutterCommand where terminal output wrapping could be disabled for non-migrated commands, and suggests making featureFlags a required parameter in ConfigCommand to simplify the class structure and eliminate the need for a fallback implementation.

…nsion tests

…n ConfigCommand

…tFeatureFlags

…ics in ConfigCommand

gemini-code-assist

Code Review

This pull request refactors ConfigCommand to explicitly accept AndroidContext, ToolContext, and FeatureFlags via its constructor, removing its reliance on global variables from globals.dart. The associated unit tests have been updated to use testWithoutContext by injecting fake dependencies. The review feedback suggests removing an unused analytics parameter from the createConfigCommand helper method in the test suite to clean up the code.

gemini-code-assist · 2026-08-27T21:15:03Z

+    FeatureFlags? featureFlags,
+    Analytics? analytics,
+    bool verboseHelp = false,


The analytics parameter in createConfigCommand is unused. Since ConfigCommand does not accept Analytics directly in its constructor, this parameter can be safely removed to keep the helper method clean.

Suggested change

FeatureFlags? featureFlags,

Analytics? analytics,

bool verboseHelp = false,

FeatureFlags? featureFlags,

bool verboseHelp = false,

…config_test.dart

flutter/flutter@e8dca90...8d8c1aa 2026-08-28 [email protected] Roll Packages from bd3cbc1 to cd4cdd0 (15 revisions) (flutter/flutter#191965) 2026-08-28 [email protected] Bump customer testing version to pick up forui tests (flutter/flutter#191931) 2026-08-28 [email protected] Use leading scroll offset instead of infinite offset to reveal pinned slivers (flutter/flutter#191329) 2026-08-28 [email protected] Roll Skia from 21f71051e749 to fe0b9a5261f9 (1 revision) (flutter/flutter#191960) 2026-08-28 [email protected] Share the common Linux window controller code in mixins (flutter/flutter#191930) 2026-08-28 [email protected] Roll Dart SDK from 2cf2f69fd9f0 to ae63a6eca3f1 (1 revision) (flutter/flutter#191953) 2026-08-28 [email protected] Roll Skia from 11e3a7cb0fd0 to 21f71051e749 (3 revisions) (flutter/flutter#191942) 2026-08-28 [email protected] Roll Dart SDK from e030e77d5413 to 2cf2f69fd9f0 (2 revisions) (flutter/flutter#191934) 2026-08-28 [email protected] Remove no-shuffle in flutter tools overall experience test (flutter/flutter#191861) 2026-08-28 [email protected] [flutter_tools] Gracefully handle Windows Application Control and security policy execution blocks (flutter/flutter#191912) 2026-08-28 [email protected] [tool] Migrate ConfigCommand to modular dependency injection (flutter/flutter#190743) 2026-08-28 [email protected] Roll Skia from 37459da0a755 to 11e3a7cb0fd0 (9 revisions) (flutter/flutter#191929) 2026-08-28 [email protected] Connect to moved-to-rect after the window is realized (flutter/flutter#191773) 2026-08-28 [email protected] macOS: Compare accessibility strings as NSStrings in tests (flutter/flutter#191853) 2026-08-28 [email protected] macOS: Record test accessibility notifications in a dictionary (flutter/flutter#191854) 2026-08-28 [email protected] Roll Fuchsia Test Scripts from 6SXRz6wsA2Zm_rAqP... to u_fSMsPU22VvUsvSo... (flutter/flutter#191927) 2026-08-28 [email protected] Roll Dart SDK from cb4c39d067f3 to e030e77d5413 (3 revisions) (flutter/flutter#191923) 2026-08-27 [email protected] Migrate ios driver tests batch 2 to simulators (flutter/flutter#190930) 2026-08-27 [email protected] [flutter_test] Ensure LiveTestWidgetsFlutterBinding executes frame and pointer callbacks in the test zone (flutter/flutter#191595) 2026-08-27 [email protected] Deprecate legacy gen_defaults tool (flutter/flutter#191911) 2026-08-27 [email protected] Fix black window in the subsurface view renderer (flutter/flutter#191850) 2026-08-27 [email protected] Roll Skia from 82e972ea84b1 to 37459da0a755 (10 revisions) (flutter/flutter#191906) 2026-08-27 [email protected] iOS: Key the platform view factory registries by NSString (flutter/flutter#191855) 2026-08-27 [email protected] Sync CHANGELOG.md from stable (flutter/flutter#191895) 2026-08-27 [email protected] [flutter_tools] Honor configured build-dir across flutter project and build targets (flutter/flutter#191592) 2026-08-27 [email protected] Revert: Handle linear and radial gradients in UberSDF (flutter/flutter#191913) 2026-08-27 [email protected] Explicitly disable HCPP in hybrid_android_views integration test (flutter/flutter#191894) If this roll has caused a breakage, revert this CL and stop the roller 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#12679) flutter/flutter@e8dca90...8d8c1aa 2026-08-28 [email protected] Roll Packages from bd3cbc1 to cd4cdd0 (15 revisions) (flutter/flutter#191965) 2026-08-28 [email protected] Bump customer testing version to pick up forui tests (flutter/flutter#191931) 2026-08-28 [email protected] Use leading scroll offset instead of infinite offset to reveal pinned slivers (flutter/flutter#191329) 2026-08-28 [email protected] Roll Skia from 21f71051e749 to fe0b9a5261f9 (1 revision) (flutter/flutter#191960) 2026-08-28 [email protected] Share the common Linux window controller code in mixins (flutter/flutter#191930) 2026-08-28 [email protected] Roll Dart SDK from 2cf2f69fd9f0 to ae63a6eca3f1 (1 revision) (flutter/flutter#191953) 2026-08-28 [email protected] Roll Skia from 11e3a7cb0fd0 to 21f71051e749 (3 revisions) (flutter/flutter#191942) 2026-08-28 [email protected] Roll Dart SDK from e030e77d5413 to 2cf2f69fd9f0 (2 revisions) (flutter/flutter#191934) 2026-08-28 [email protected] Remove no-shuffle in flutter tools overall experience test (flutter/flutter#191861) 2026-08-28 [email protected] [flutter_tools] Gracefully handle Windows Application Control and security policy execution blocks (flutter/flutter#191912) 2026-08-28 [email protected] [tool] Migrate ConfigCommand to modular dependency injection (flutter/flutter#190743) 2026-08-28 [email protected] Roll Skia from 37459da0a755 to 11e3a7cb0fd0 (9 revisions) (flutter/flutter#191929) 2026-08-28 [email protected] Connect to moved-to-rect after the window is realized (flutter/flutter#191773) 2026-08-28 [email protected] macOS: Compare accessibility strings as NSStrings in tests (flutter/flutter#191853) 2026-08-28 [email protected] macOS: Record test accessibility notifications in a dictionary (flutter/flutter#191854) 2026-08-28 [email protected] Roll Fuchsia Test Scripts from 6SXRz6wsA2Zm_rAqP... to u_fSMsPU22VvUsvSo... (flutter/flutter#191927) 2026-08-28 [email protected] Roll Dart SDK from cb4c39d067f3 to e030e77d5413 (3 revisions) (flutter/flutter#191923) 2026-08-27 [email protected] Migrate ios driver tests batch 2 to simulators (flutter/flutter#190930) 2026-08-27 [email protected] [flutter_test] Ensure LiveTestWidgetsFlutterBinding executes frame and pointer callbacks in the test zone (flutter/flutter#191595) 2026-08-27 [email protected] Deprecate legacy gen_defaults tool (flutter/flutter#191911) 2026-08-27 [email protected] Fix black window in the subsurface view renderer (flutter/flutter#191850) 2026-08-27 [email protected] Roll Skia from 82e972ea84b1 to 37459da0a755 (10 revisions) (flutter/flutter#191906) 2026-08-27 [email protected] iOS: Key the platform view factory registries by NSString (flutter/flutter#191855) 2026-08-27 [email protected] Sync CHANGELOG.md from stable (flutter/flutter#191895) 2026-08-27 [email protected] [flutter_tools] Honor configured build-dir across flutter project and build targets (flutter/flutter#191592) 2026-08-27 [email protected] Revert: Handle linear and radial gradients in UberSDF (flutter/flutter#191913) 2026-08-27 [email protected] Explicitly disable HCPP in hybrid_android_views integration test (flutter/flutter#191894) If this roll has caused a breakage, revert this CL and stop the roller 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 requested review from a team as code owners August 7, 2026 20:57

bkonyi requested review from gmackall and removed request for a team August 7, 2026 20:57

flutter-dashboard Bot added the CICD Run CI/CD label Aug 7, 2026

github-actions Bot added tool Affects the "flutter" command-line tool. See also t: labels. team-android Owned by Android platform team team-ios Owned by iOS platform team team-macos Owned by the macOS platform team labels Aug 7, 2026

gemini-code-assist Bot reviewed Aug 7, 2026

View reviewed changes

bkonyi force-pushed the di/03-config branch from 6946040 to 92e56ab Compare August 7, 2026 21:31

bkonyi mentioned this pull request Aug 7, 2026

[tool] Migrate DoctorCommand to modular dependency injection #190758

Merged

bkonyi force-pushed the di/03-config branch from 92e56ab to c6d9e62 Compare August 8, 2026 00:34

bkonyi marked this pull request as draft August 8, 2026 16:38

bkonyi removed request for a team and gmackall August 8, 2026 16:41

bkonyi force-pushed the di/03-config branch from c6d9e62 to f954ad2 Compare August 11, 2026 14:47

[tool] Define modular dependency injection containers and bootstrapper

85aa4f1

bkonyi force-pushed the di/03-config branch from f954ad2 to 3d231e0 Compare August 11, 2026 15:31

bkonyi added 2 commits August 11, 2026 17:52

[tool] Address review comments on modular dependency injection contai…

341b711

…ners

[tool] Wire dependency injection into runner and executable with requ…

5533bb8

…ired non-nullable contexts

bkonyi force-pushed the di/03-config branch 2 times, most recently from 463d602 to 4d17077 Compare August 11, 2026 19:48

bkonyi added 4 commits August 12, 2026 17:19

Merge remote-tracking branch 'origin/master' into di/02-runner-bootstrap

0125d94

# Conflicts: # packages/flutter_tools/lib/src/context/tool_dependencies.dart # packages/flutter_tools/test/general.shard/context/dependency_injection_test.dart

[tool] Address review feedback on FlutterCommandRunner dependency inj…

cd90309

…ection

[tool] Require ToolDependencies on FlutterCommandRunner and eliminate…

9f24ddb

… globals fallback

[tool] Remove unused getters and store analytics and toolContext dire…

15d4ff6

…ctly in FlutterCommandRunner

bkonyi force-pushed the di/03-config branch from 4d17077 to 17e7a29 Compare August 12, 2026 18:16

gemini-code-assist Bot reviewed Aug 27, 2026

View reviewed changes

bkonyi added 4 commits August 27, 2026 01:35

[tool] Explicitly inject featureFlags into ConfigCommand in tool exte…

0c888bf

…nsion tests

Merge branch 'upstream/master' into di/03-config

7e86799

[tool] Restore original description and remove redundant printUsage i…

c977634

…n ConfigCommand

[tool] Make featureFlags required in ConfigCommand and remove _Defaul…

508cc17

…tFeatureFlags

github-actions Bot removed team-ios Owned by iOS platform team team-macos Owned by the macOS platform team labels Aug 27, 2026

bkonyi added 5 commits August 27, 2026 20:43

[tool] Make analytics required in ConfigCommand

24b7c9c

[tool] Add analytics parameter to FlutterCommand and use super.analyt…

be8d28d

…ics in ConfigCommand

[tool] Let FlutterCommandRunner own Analytics for FlutterCommand

1786481

[tool] Make featureFlags public in ConfigCommand

16c0f18

[tool] Store non-nullable _toolContext in ConfigCommand

5b2972c

bkonyi marked this pull request as ready for review August 27, 2026 21:11

bkonyi requested review from chingjun and loic-sharma August 27, 2026 21:12

gemini-code-assist Bot reviewed Aug 27, 2026

View reviewed changes

[tool] Remove unused analytics parameter from createConfigCommand in …

caac485

…config_test.dart

loic-sharma approved these changes Aug 27, 2026

View reviewed changes

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

auto-submit Bot added this pull request to the merge queue Aug 28, 2026

Merged via the queue into flutter:master with commit 6ad2029 Aug 28, 2026
23 checks passed

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

Conversation

bkonyi commented Aug 7, 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!

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!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

bkonyi Aug 27, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

bkonyi commented Aug 7, 2026 •

edited

Loading