Skip to content

[tool] Migrate Upgrade, Downgrade, and UpdatePackages commands to modular dependency injection - #190787

Merged
auto-submit[bot] merged 25 commits into
flutter:masterfrom
bkonyi:di/19-version-and-packages
Sep 11, 2026
Merged

auto-submit[bot] merged 25 commits into
flutter:masterfrom
bkonyi:di/19-version-and-packages

Conversation

@bkonyi

@bkonyi bkonyi commented Aug 8, 2026 •

Copy link
Copy Markdown
Contributor

Summary

Part 19 of the modular dependency injection migration.

Stacked on PR 19a (#192460).

  • Migrates UpgradeCommand, DowngradeCommand, and UpdatePackagesCommand to modular constructor dependency injection:
    • UpgradeCommand({required ToolContext toolContext, required bool verboseHelp, UpgradeCommandRunner? commandRunner})
    • DowngradeCommand({required ToolContext toolContext, required bool verboseHelp})
    • UpdatePackagesCommand({required ToolContext toolContext, required bool verboseHelp})
  • Requires platform in FlutterVersion.fromRevision and eliminates globals.logger references.
  • Migrates unit tests in test/commands.shard/hermetic/upgrade_test.dart, downgrade_test.dart, and update_packages_test.dart to hermetic testWithoutContext.

Part of #188471

@github-actions github-actions Bot added tool Affects the "flutter" command-line tool. See also t: labels. a: desktop Running on desktop team-android Owned by Android platform team team-ios Owned by iOS platform team team-macos Owned by the macOS platform team team-windows Owned by the Windows platform team team-linux Owned by the Linux platform team labels Aug 8, 2026
@bkonyi
bkonyi force-pushed the di/19-version-and-packages branch 7 times, most recently from 4ec3649 to 98b3124 Compare August 12, 2026 18:39
@bkonyi
bkonyi force-pushed the di/19-version-and-packages branch from 98b3124 to ad31503 Compare September 2, 2026 13:26
@bkonyi
bkonyi marked this pull request as ready for review September 2, 2026 13:26
@bkonyi bkonyi added the CICD Run CI/CD label Sep 2, 2026
@github-actions github-actions Bot removed a: desktop Running on desktop team-android Owned by Android platform team team-ios Owned by iOS platform team team-macos Owned by the macOS platform team team-windows Owned by the Windows platform team team-linux Owned by the Linux platform team labels Sep 2, 2026

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request refactors several commands in flutter_tools—including DowngradeCommand, PackagesCommand, UpdatePackagesCommand, and UpgradeCommand—to utilize ToolContext for dependency injection instead of relying on global zone-injected variables. Additionally, _DefaultPub is updated to locate package_config.json via workspace_ref.json in pub workspaces, and associated tests are migrated to testWithoutContext. Feedback on these changes highlights a potential crash when decoding workspace_ref.json if it contains invalid JSON, and suggests using the injected projectFactory in UpgradeCommandRunner to fully adhere to modular dependency injection.

Comment thread packages/flutter_tools/lib/src/dart/pub.dart Outdated
Comment thread packages/flutter_tools/lib/src/commands/upgrade.dart Outdated
@bkonyi

bkonyi commented Sep 2, 2026

Copy link
Copy Markdown
Contributor Author

/gemini review

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request refactors various commands in flutter_tools to inject dependencies via ToolContext instead of accessing global variables, updating the corresponding hermetic tests to run without zone overrides. It also updates the package configuration resolution in pub.dart to support pub workspaces using workspace_ref.json. Feedback on the changes identifies that the workspace resolution logic incorrectly sets packageConfigFile to the workspace root directory instead of the package_config.json file itself, which prevents the checkUpToDate optimization from running.

Comment thread packages/flutter_tools/lib/src/dart/pub.dart
…ons in PR 19

- Remove introduced globals.logger callsites in findPlugins callers and revert untouched collateral files (web/compile.dart, xcode_project.dart).
- Pass inherited logger in build_swift_package.dart and explicit platform in pub.dart and upgrade.dart to eliminate ambient globals.platform reads.
- Remove redundant Pub? pub injection across PackagesCommand and subcommands, deduplicating Pub construction and caching via late final Pub _pub.
- Remove redundant SystemClock? clock injection from UpgradeCommandRunner, sourcing time directly from _toolContext.systemClock.
- Cache repeated _toolContext field accesses locally in PackagesGetCommand, UpgradeCommand, and UpgradeCommandRunner.
- Modernize hermetic pub_test.dart and permeable upgrade_test.dart to run cleanly with 0 analysis issues and 100% test pass rate.
… injection

* Migrate `PackagesCommand` and its subcommands to modular constructor dependency injection with zero global fallbacks.
* Migrate `Pub` and `DefaultPub` to explicit constructor injection (`botDetector`, `fileSystem`, `logger`, `platform`, `processManager`, `stdio`).
* Wire `PackagesCommand` with `toolDependencies.buildSystem` and `toolDependencies.toolContext` in `executable.dart`.
* Pass optional `logger` to `findPlugins` to eliminate ambient `globals.logger` fallback when available.
* Convert `pub_test.dart` and `packages_test.dart` to use `testWithoutContext` and `DelegatingToolContext` where appropriate.
@bkonyi bkonyi changed the title [tool] Migrate Version and Packages commands to modular dependency injection [tool] Migrate Upgrade, Downgrade, and UpdatePackages commands to modular dependency injection Sep 9, 2026
@bkonyi
bkonyi requested a review from chingjun September 9, 2026 22:54
@bkonyi bkonyi added the autosubmit Merge PR when tree becomes green via auto submit App label Sep 11, 2026
@auto-submit
auto-submit Bot added this pull request to the merge queue Sep 11, 2026
Merged via the queue into flutter:master with commit b1602f6 Sep 11, 2026
23 checks passed
@flutter-dashboard flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Sep 11, 2026
pull Bot pushed a commit to TheRakeshPurohit/flutter that referenced this pull request Sep 11, 2026
flutter#192460)

Migrates PackagesCommand, its subcommands, and Pub to modular dependency
injection with ToolContext. Stacked before PR flutter#190787.
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request Sep 12, 2026
Roll Flutter from 63b9518f16bc to 2553f89be1ef (62 revisions)

flutter/flutter@63b9518...2553f89

2026-09-12 [email protected] Roll clang to 07d67299a15ce03b053736e2d31a668ee0576987 (flutter/flutter#192607)
2026-09-12 [email protected] Roll Dart SDK from b24b352c29db to 7863887acbfb (3 revisions) (flutter/flutter#192665)
2026-09-12 [email protected] fix(tree): et format --all (flutter/flutter#192669)
2026-09-12 [email protected] Support activity-alias in Android launcher activity detection (flutter/flutter#187251)
2026-09-12 [email protected] fix: regenerate gradle lockfiles for external_textures integration test (flutter/flutter#192657)
2026-09-12 [email protected] Roll Skia from 51aa02b2c195 to e5e96533b732 (4 revisions) (flutter/flutter#192646)
2026-09-12 [email protected] [WebParagraph] Fix text pixelation, glyph clipping, and snapping offsets to avoid subpixel raster caching (flutter/flutter#191736)
2026-09-12 [email protected] fix(tests): Add ruby dep to Mac windowing_test (flutter/flutter#192656)
2026-09-12 [email protected] Remove some `unawaited_futures` outdated ignores (flutter/flutter#192026)
2026-09-11 [email protected] Bump Dart to 3.13, reformat, re-enable formatting check (flutter/flutter#192649)
2026-09-11 [email protected] [android] Isolate API-34 high contrast listener in AccessibilityBridge behind Api34Impl (flutter/flutter#192502)
2026-09-11 [email protected] Update style guide for Dart 3.13 (flutter/flutter#192639)
2026-09-11 [email protected] ci(bringups): remove bringup from these tests (flutter/flutter#192637)
2026-09-11 [email protected] Unmark new_gallery_windows_impeller__transition_perf as bringup (flutter/flutter#192633)
2026-09-11 [email protected] Unmark new_gallery_windows_skia__transition_perf as bringup (flutter/flutter#192635)
2026-09-11 [email protected] Roll Skia from f446aec4ce9e to 51aa02b2c195 (2 revisions) (flutter/flutter#192631)
2026-09-11 [email protected] fix(ci): mac verify binaries still racing (flutter/flutter#192634)
2026-09-11 [email protected] Roll Packages from 8a35b16 to 9caa77c (8 revisions) (flutter/flutter#192630)
2026-09-11 [email protected] Roll Dart SDK from a76fee2722e0 to b24b352c29db (2 revisions) (flutter/flutter#192627)
2026-09-11 [email protected] [tool] Migrate PackagesCommand and Pub to modular dependency injection (flutter/flutter#192460)
2026-09-11 [email protected] [tool] Migrate Darwin framework commands to modular dependency injection (flutter/flutter#192252)
2026-09-11 [email protected] [tool] Migrate Upgrade, Downgrade, and UpdatePackages commands to modular dependency injection (flutter/flutter#190787)
2026-09-11 [email protected] Roll Skia from b3fa80a0e168 to f446aec4ce9e (55 revisions) (flutter/flutter#192620)
2026-09-11 [email protected] Roll Dart SDK from d20d59cfa664 to a76fee2722e0 (2 revisions) (flutter/flutter#192616)
2026-09-11 [email protected] remove deeplink integration tests from bringup (flutter/flutter#192459)
2026-09-11 [email protected] Revert: [devicelab] Clean up Chrome profile directories and trap abort signals in web benchmarks (flutter/flutter#192615)
2026-09-11 [email protected] Roll Fuchsia Linux SDK from C0j8F-_Iy-OQZ6YyI... to m69nfK-wnHaMTe8P9... (flutter/flutter#192608)
2026-09-11 [email protected] Fix Wasm build cache mismatch in ResidentWebRunner and browser 404 fallbacks (flutter/flutter#190786)
2026-09-11 [email protected] Roll Dart SDK from 3ce3116bc9ec to d20d59cfa664 (1 revision) (flutter/flutter#192588)
2026-09-11 [email protected] [Linux] Keep the frame at the top of a resizing subsurface (flutter/flutter#192408)
2026-09-10 [email protected] [devicelab] Clean up Chrome profile directories and trap abort signals in web benchmarks (flutter/flutter#192584)
2026-09-10 [email protected] [web] Keep ImageSource alive until Picture disposal (flutter/flutter#192516)
2026-09-10 [email protected] Remove the accessibility evaluations feature flag (flutter/flutter#192266)
2026-09-10 [email protected] Promote Windows gradient benchmark tests to non-bringup (flutter/flutter#192581)
2026-09-10 [email protected] Remove commented out export in `text_input.dart` since the dart compiler has the correct behavior now (flutter/flutter#191539)
2026-09-10 [email protected] [flutter_tools] Do not mistake server-initiated requests for responses to client requests in AnalysisServer (flutter/flutter#192546)
2026-09-10 [email protected] Roll Packages from 36e088a to 8a35b16 (12 revisions) (flutter/flutter#192550)
2026-09-10 [email protected] Roll pub packages (flutter/flutter#192517)
2026-09-10 [email protected] feat(web): support --web-content-hash for entrypoint files (flutter/flutter#190153)
2026-09-10 [email protected] [web] Stop iOS auto-zoom by sizing semantic inputs at 16px (flutter/flutter#192328)
2026-09-10 [email protected] Roll Dart SDK from 0d55b7a6a9ee to 3ce3116bc9ec (2 revisions) (flutter/flutter#192534)
2026-09-10 [email protected] Update more enum instances comparison to use equality == since dart has the correct behavior now (flutter/flutter#191788)
2026-09-10 [email protected] Fix specify_nonobvious_local_variable_types lints in luci_resultdb_test.dart (flutter/flutter#192543)
2026-09-10 [email protected] Roll ICU from 8cc91d9b6ab9 to 6ebb40c59477 (1 revision) (flutter/flutter#192527)
2026-09-10 [email protected] [Linux] Make the framebuffer depth/stencil buffer optional (flutter/flutter#192156)
2026-09-10 [email protected] [Linux] Cancel input when events stop being delivered (flutter/flutter#192277)
...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CICD Run CI/CD team-ios Owned by iOS platform team team-macos Owned by the macOS platform team tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants