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

bkonyi · 2026-08-07T20:59:47Z

Summary

Part 6 of the modular dependency injection migration.

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

Stacked on #190744
Compare: bkonyi/flutter@di/04-symbolize...di/05-channel

Part of #47161

gemini-code-assist

Code Review

This pull request refactors the Flutter tool to use dependency injection by introducing ToolContext, AndroidContext, and AppleContext, along with a ToolDependencies bootstrap class. This transition replaces global dependencies with injected ones, improving testability and modularity across various commands and runner components. The review feedback highlights specific areas where injected dependencies should be used instead of globals, recommends using mockable system clocks for better testability, and suggests cleaning up redundant null-coalescing logic.

…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

… symbolize_test.dart

# Conflicts: # packages/flutter_tools/test/commands.shard/hermetic/config_test.dart

# Conflicts: # packages/flutter_tools/lib/src/commands/channel.dart # packages/flutter_tools/test/general.shard/channel_test.dart

… channel_test.dart

gemini-code-assist

Code Review

This pull request refactors ChannelCommand and SymbolizeCommand to resolve their dependencies through an injected ToolContext rather than global context zones, enabling their corresponding tests to run hermetically using testWithoutContext. Feedback on these changes suggests restoring the documentation comment for precacheArtifacts to comply with the repository style guide, and replacing const LocalPlatform() with FakePlatform() in the channel tests to prevent platform-dependent test failures.

…n channel_test.dart

…#190758) ## Summary Part 7 of the modular dependency injection migration. Migrates `DoctorCommand` to explicit constructor dependency injection via `ToolContext`, `Doctor`, and `AndroidLicenseValidator`, removing ambient access from `FlutterCommand` and adding hermetic unit tests. Stacked on flutter#190751 Compare: bkonyi/flutter@di/05-channel...di/06-doctor Part of flutter#47161

flutter/flutter@0cbd1a4...70797e1 2026-09-02 [email protected] [analysis] Upgrade package:analyzer to 14.3.0 and enable custom plugin compilation (flutter/flutter#191590) 2026-09-02 [email protected] Roll Dart SDK from d8d7869d8031 to 9a8fbde80f6c (1 revision) (flutter/flutter#192179) 2026-09-02 [email protected] Roll Skia from dec311244db4 to ae22da2e8308 (1 revision) (flutter/flutter#192177) 2026-09-02 [email protected] [tool] Migrate DoctorCommand to modular dependency injection (flutter/flutter#190758) 2026-09-02 [email protected] Roll Skia from 482b7e285244 to dec311244db4 (3 revisions) (flutter/flutter#192161) 2026-09-02 [email protected] Roll Skia from 28447e9fb8d5 to 482b7e285244 (3 revisions) (flutter/flutter#192157) 2026-09-02 [email protected] feat: Add placeholder to DecorationImage (flutter/flutter#191528) 2026-09-02 [email protected] [Android] Do not schedule engine frames on a detached FlutterJNI (flutter/flutter#191204) 2026-09-02 [email protected] Roll Skia from 3a242fb7cdb3 to 28447e9fb8d5 (1 revision) (flutter/flutter#192145) 2026-09-02 [email protected] Roll Dart SDK from 9164def35347 to d8d7869d8031 (2 revisions) (flutter/flutter#192144) 2026-09-02 [email protected] Add FadeInImageTransition.fadeInOver to fade the image in over the placeholder (flutter/flutter#186246) 2026-09-02 [email protected] Roll Skia from 63d13ec4df6d to 3a242fb7cdb3 (9 revisions) (flutter/flutter#192138) 2026-09-02 [email protected] [flutter_tools] Add --no-plugins flag and disable plugins for benchmark (flutter/flutter#192129) 2026-09-02 [email protected] [tool] Migrate ChannelCommand to modular dependency injection (flutter/flutter#190751) 2026-09-01 [email protected] Add mouseCursor to RawScrollbar (flutter/flutter#185750) 2026-09-01 [email protected] Fix self-comparison and assert typos in TestSemantics (flutter/flutter#191938) 2026-09-01 [email protected] [Linux] Wait for frames to be rendered before using them in another context (flutter/flutter#192094) 2026-09-01 [email protected] [wimp] Turn on multithreading for wimp. (flutter/flutter#191747) 2026-09-01 [email protected] Roll Skia from 3911a1fe7f7a to 63d13ec4df6d (6 revisions) (flutter/flutter#192125) 2026-09-01 [email protected] Remove the redundant flutter/shell/platform/android:robolectric_tests build target (flutter/flutter#192117) 2026-09-01 [email protected] [iOS] Preserve semantics parents after reparenting (flutter/flutter#189686) 2026-09-01 [email protected] [flutter_tools] Report preview reload timing analytics in LspPreviewDetector (flutter/flutter#192120) 2026-09-01 [email protected] [flutter_tools] Implement Templates slice and flutter create integration (flutter/flutter#191748) 2026-09-01 [email protected] Uiscene migrate add2app hosts (flutter/flutter#191847) 2026-09-01 [email protected] Roll Packages from d642322 to 7a7912f (8 revisions) (flutter/flutter#192119) 2026-09-01 [email protected] [web] Anchor flt-semantics-host at 0,0 to fix WebKit semantics offset (flutter/flutter#190486) 2026-09-01 [email protected] Replace Shell::WaitForFirstFrame with an asynchronous API that matches the Shell threading model (flutter/flutter#191841) 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] 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#12727) flutter/flutter@0cbd1a4...70797e1 2026-09-02 [email protected] [analysis] Upgrade package:analyzer to 14.3.0 and enable custom plugin compilation (flutter/flutter#191590) 2026-09-02 [email protected] Roll Dart SDK from d8d7869d8031 to 9a8fbde80f6c (1 revision) (flutter/flutter#192179) 2026-09-02 [email protected] Roll Skia from dec311244db4 to ae22da2e8308 (1 revision) (flutter/flutter#192177) 2026-09-02 [email protected] [tool] Migrate DoctorCommand to modular dependency injection (flutter/flutter#190758) 2026-09-02 [email protected] Roll Skia from 482b7e285244 to dec311244db4 (3 revisions) (flutter/flutter#192161) 2026-09-02 [email protected] Roll Skia from 28447e9fb8d5 to 482b7e285244 (3 revisions) (flutter/flutter#192157) 2026-09-02 [email protected] feat: Add placeholder to DecorationImage (flutter/flutter#191528) 2026-09-02 [email protected] [Android] Do not schedule engine frames on a detached FlutterJNI (flutter/flutter#191204) 2026-09-02 [email protected] Roll Skia from 3a242fb7cdb3 to 28447e9fb8d5 (1 revision) (flutter/flutter#192145) 2026-09-02 [email protected] Roll Dart SDK from 9164def35347 to d8d7869d8031 (2 revisions) (flutter/flutter#192144) 2026-09-02 [email protected] Add FadeInImageTransition.fadeInOver to fade the image in over the placeholder (flutter/flutter#186246) 2026-09-02 [email protected] Roll Skia from 63d13ec4df6d to 3a242fb7cdb3 (9 revisions) (flutter/flutter#192138) 2026-09-02 [email protected] [flutter_tools] Add --no-plugins flag and disable plugins for benchmark (flutter/flutter#192129) 2026-09-02 [email protected] [tool] Migrate ChannelCommand to modular dependency injection (flutter/flutter#190751) 2026-09-01 [email protected] Add mouseCursor to RawScrollbar (flutter/flutter#185750) 2026-09-01 [email protected] Fix self-comparison and assert typos in TestSemantics (flutter/flutter#191938) 2026-09-01 [email protected] [Linux] Wait for frames to be rendered before using them in another context (flutter/flutter#192094) 2026-09-01 [email protected] [wimp] Turn on multithreading for wimp. (flutter/flutter#191747) 2026-09-01 [email protected] Roll Skia from 3911a1fe7f7a to 63d13ec4df6d (6 revisions) (flutter/flutter#192125) 2026-09-01 [email protected] Remove the redundant flutter/shell/platform/android:robolectric_tests build target (flutter/flutter#192117) 2026-09-01 [email protected] [iOS] Preserve semantics parents after reparenting (flutter/flutter#189686) 2026-09-01 [email protected] [flutter_tools] Report preview reload timing analytics in LspPreviewDetector (flutter/flutter#192120) 2026-09-01 [email protected] [flutter_tools] Implement Templates slice and flutter create integration (flutter/flutter#191748) 2026-09-01 [email protected] Uiscene migrate add2app hosts (flutter/flutter#191847) 2026-09-01 [email protected] Roll Packages from d642322 to 7a7912f (8 revisions) (flutter/flutter#192119) 2026-09-01 [email protected] [web] Anchor flt-semantics-host at 0,0 to fix WebKit semantics offset (flutter/flutter#190486) 2026-09-01 [email protected] Replace Shell::WaitForFirstFrame with an asynchronous API that matches the Shell threading model (flutter/flutter#191841) 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] 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:59

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

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

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

Comment thread packages/flutter_tools/lib/src/context/tool_dependencies.dart Outdated

Comment thread packages/flutter_tools/lib/src/context/tool_dependencies.dart Outdated

bkonyi force-pushed the di/05-channel branch from 3a7a29c to d2a79cc Compare August 7, 2026 21:34

bkonyi mentioned this pull request Aug 7, 2026

[tool] Migrate DoctorCommand to modular dependency injection #190758

Merged

bkonyi force-pushed the di/05-channel branch from d2a79cc to 391a07b Compare August 8, 2026 00:36

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

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

bkonyi force-pushed the di/05-channel branch from 391a07b to 3164c11 Compare August 11, 2026 14:47

[tool] Define modular dependency injection containers and bootstrapper

85aa4f1

bkonyi force-pushed the di/05-channel branch from 3164c11 to abdfdcc 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/05-channel branch 2 times, most recently from 2fca6b5 to e28b446 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/05-channel branch from e28b446 to 135da87 Compare August 12, 2026 18:16

bkonyi added 6 commits August 27, 2026 21:17

Merge branch 'di/03-config' into di/04-symbolize

4d39d30

[tool] Default createConfigCommand to test fixtures in config_test.dart

a35837d

Merge branch 'di/03-config' into di/04-symbolize

eb7b9dd

[tool] Explicitly override toolContext getter and assert injection in…

4f0fef1

… symbolize_test.dart

Merge remote-tracking branch 'upstream/master' into di/04-symbolize

82c6d03

# Conflicts: # packages/flutter_tools/test/commands.shard/hermetic/config_test.dart

Merge branch 'di/04-symbolize' into di/05-channel

f8daa08

# Conflicts: # packages/flutter_tools/lib/src/commands/channel.dart # packages/flutter_tools/test/general.shard/channel_test.dart

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

[tool] Explicitly override toolContext getter and assert injection in…

8554b7c

… channel_test.dart

bkonyi marked this pull request as ready for review August 28, 2026 18:36

gemini-code-assist Bot reviewed Aug 28, 2026

View reviewed changes

Comment thread packages/flutter_tools/lib/src/commands/upgrade.dart

Comment thread packages/flutter_tools/test/general.shard/channel_test.dart Outdated

bkonyi added 2 commits August 28, 2026 19:06

[tool] Restore precacheArtifacts documentation and use FakePlatform i…

618c28a

…n channel_test.dart

Merge remote-tracking branch 'upstream/master' into di/05-channel

18c47bc

bkonyi requested a review from chingjun September 1, 2026 01:07

chingjun approved these changes Sep 1, 2026

View reviewed changes

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

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

Merged via the queue into flutter:master with commit 32b3fdf Sep 2, 2026
23 checks passed

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

Navigation Menu

Repository navigation

[tool] Migrate ChannelCommand to modular dependency injection - #190751

[tool] Migrate ChannelCommand to modular dependency injection#190751
auto-submit[bot] merged 68 commits into
flutter:masterfrom
bkonyi:di/05-channel

bkonyi commented Aug 7, 2026 •

edited

Loading

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

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!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

bkonyi commented Aug 7, 2026 •

edited

Loading