[ Tool ] Fix update-packages failing due to mismatched dependencies between flutter_tools and the framework#181335
Conversation
… between flutter_tools and the framework Since the `widget_preview_scaffold` project depends on both the Flutter SDK and flutter_tools, flutter_tools must use the same version pins as the Flutter SDK. This change ensures that any packages used by both the Flutter SDK and flutter_tools use the same pinned version. Fixes flutter#180503
There was a problem hiding this comment.
Code Review
This pull request effectively addresses an issue with mismatched dependencies in the update-packages command by ensuring flutter_tools and the Flutter framework use consistent package versions. The core logic is sound: it first resolves dependencies for the framework and then uses these versions to pin dependencies for flutter_tools. The changes are well-implemented, including a clear refactoring of CherryPick to PackageVersion and improving the _upgrade method's signature. The accompanying tests are thorough and validate the new pinning mechanism. I have one minor suggestion to remove a duplicated assertion in a test file to improve maintainability.
Piinks
left a comment
There was a problem hiding this comment.
LGTM - thank you for fixing this!!
…pendencies between flutter_tools and the framework (flutter/flutter#181335)
Roll Flutter from 48c2475 to bfc9041eb118 (173 revisions) flutter/flutter@48c2475...bfc9041 2026-01-23 matt.kosarek@canonical.com No longer exiting the application when the RegularWindow is destroyed + resolving the window created promise after runWidget (flutter/flutter#181339) 2026-01-23 kazbek.sultanov.doc@gmail.com Remove unnecessary Material import from dialog_test.dart (flutter/flutter#181249) 2026-01-23 engine-flutter-autoroll@skia.org Roll Skia from 8e516fe6828f to db10db8bd55f (1 revision) (flutter/flutter#181379) 2026-01-23 50643541+Mairramer@users.noreply.github.com Reset TextFormField to initial value after state change (flutter/flutter#181199) 2026-01-23 engine-flutter-autoroll@skia.org Roll Dart SDK from 980b2b41d36e to e82d7ad1855e (1 revision) (flutter/flutter#181375) 2026-01-23 engine-flutter-autoroll@skia.org Roll Skia from 3e86f377d300 to 8e516fe6828f (4 revisions) (flutter/flutter#181370) 2026-01-23 kazbek.sultanov.doc@gmail.com Remove unnecessary Material import from sliver_visibility_test (flutter/flutter#181248) 2026-01-23 43635580+Lilian-C@users.noreply.github.com Add bottom navigation bar item semantics label (flutter/flutter#180577) 2026-01-23 58190796+MitchellGoodwin@users.noreply.github.com Make topGap not required for CupertinoSheetTransition (flutter/flutter#181269) 2026-01-23 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from b4cLyhuxciUC-4zCJ... to n7NohL9DPpEuPjNt9... (flutter/flutter#181365) 2026-01-23 engine-flutter-autoroll@skia.org Roll Dart SDK from 806f04638561 to 980b2b41d36e (1 revision) (flutter/flutter#181364) 2026-01-23 34871572+gmackall@users.noreply.github.com Reland hybrid views test (flutter/flutter#181336) 2026-01-23 git@reb0.org Revert DropdownMenu non-nullable breaking change (flutter/flutter#181074) 2026-01-23 dkwingsmt@users.noreply.github.com Fix leaks in `flutter_test` tests (flutter/flutter#180879) 2026-01-23 97480502+b-luk@users.noreply.github.com Re-enable fragment_shader_tests.dart 'Shader Compiler appropriately pads vec3 uniform arrays' test on Vulkan (flutter/flutter#181292) 2026-01-23 bkonyi@google.com [ Tool ] Fix `update-packages` failing due to mismatched dependencies between flutter_tools and the framework (flutter/flutter#181335) 2026-01-23 jason-simmons@users.noreply.github.com [Impeller] Make dynamically created shader metadata for runtime effects consistent with metadata for built-in shaders (flutter/flutter#181201) 2026-01-23 97480502+b-luk@users.noreply.github.com Broaden the applicability of `Color` fix_data rules from flutter/painting.dart (flutter/flutter#181093) 2026-01-23 15619084+vashworth@users.noreply.github.com Fixes macOS App.framework not being codesigned or find framework (flutter/flutter#181348) 2026-01-22 69134234+sutes-work@users.noreply.github.com Roll Fuchsia GN SDK from NAEC5tfgSl8g94nwp... to JLBh4Z9PKsjIJcqDU... (flutter/flutter#181139) 2026-01-22 engine-flutter-autoroll@skia.org Roll Dart SDK from ab4640ea82e9 to 806f04638561 (2 revisions) (flutter/flutter#181347) 2026-01-22 sokolovskyi.konstantin@gmail.com Add ExpansibleController.toggle method. (flutter/flutter#181320) 2026-01-22 42980667+srivats22@users.noreply.github.com Fixes Typo in codebase (flutter/flutter#181256) 2026-01-22 engine-flutter-autoroll@skia.org Roll Skia from 4766615bcc96 to 3e86f377d300 (3 revisions) (flutter/flutter#181346) 2026-01-22 ahmedsameha1@gmail.com Make sure that a Hero doesn't crash in 0x0 environment (flutter/flutter#180954) 2026-01-22 jason-simmons@users.noreply.github.com Reland "Fix capitalization of the path to FlutterWindowControllerTest.mm in the macOS platform build script" (flutter/flutter#181200) 2026-01-22 engine-flutter-autoroll@skia.org Roll Skia from 6e9746be8c4a to 4766615bcc96 (3 revisions) (flutter/flutter#181331) 2026-01-22 kazbek.sultanov.doc@gmail.com Fix remove material import textfield (flutter/flutter#181254) 2026-01-22 15619084+vashworth@users.noreply.github.com Add FlutterFramework as an Xcode SwiftPM local package override (flutter/flutter#179512) 2026-01-22 engine-flutter-autoroll@skia.org Roll Dart SDK from 7bd4c68b625c to ab4640ea82e9 (1 revision) (flutter/flutter#181324) 2026-01-22 engine-flutter-autoroll@skia.org Roll Packages from d80c60e to 9010299 (9 revisions) (flutter/flutter#181323) 2026-01-22 engine-flutter-autoroll@skia.org Roll Dart SDK from 2d53a77adc5d to 7bd4c68b625c (2 revisions) (flutter/flutter#181316) 2026-01-22 engine-flutter-autoroll@skia.org Roll Skia from 3f6949bc5780 to 6e9746be8c4a (2 revisions) (flutter/flutter#181311) 2026-01-22 engine-flutter-autoroll@skia.org Roll Skia from ef6efc358b4a to 3f6949bc5780 (2 revisions) (flutter/flutter#181307) 2026-01-22 engine-flutter-autoroll@skia.org Roll Dart SDK from 5d7c8faf2e41 to 2d53a77adc5d (1 revision) (flutter/flutter#181305) 2026-01-22 120639059+Enderjua@users.noreply.github.com [Material] update hourFormat to use Dart 3 switch expression (flutter/flutter#181041) 2026-01-22 146823759+brahim-guaali@users.noreply.github.com Use null-aware elements in cupertino/nav_bar.dart (flutter/flutter#181237) 2026-01-22 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from b2KIEXVAlEqImQ9VO... to b4cLyhuxciUC-4zCJ... (flutter/flutter#181297) 2026-01-22 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#181295) 2026-01-22 30870216+gaaclarke@users.noreply.github.com Enables fragment shader test for impeller (fixes mat2 on vulkan) (flutter/flutter#181013) 2026-01-21 engine-flutter-autoroll@skia.org Roll Dart SDK from 366200db1aa1 to 5d7c8faf2e41 (4 revisions) (flutter/flutter#181290) 2026-01-21 engine-flutter-autoroll@skia.org Roll Skia from b5ec89e31f59 to ef6efc358b4a (19 revisions) (flutter/flutter#181289) 2026-01-21 brackenavaron@gmail.com fix description for semantics finders (flutter/flutter#181214) 2026-01-21 ahmedsameha1@gmail.com Make sure that an Icon doesn't crash in 0x0 environment (flutter/flutter#181021) 2026-01-21 ahmedsameha1@gmail.com Make sure that a GridPaper doesn't crash in 0x0 environment (flutter/flutter#180906) 2026-01-21 magder@google.com Bring Linux coverage out of bringup (flutter/flutter#181280) ...
… between flutter_tools and the framework (flutter#181335) Since the `widget_preview_scaffold` project depends on both the Flutter SDK and `flutter_tools`, `flutter_tools` must use the same version pins as the Flutter SDK. This change ensures that any packages used by both the Flutter SDK and `flutter_tools` use the same pinned version. Fixes flutter#180503
) Roll Flutter from 48c2475 to bfc9041eb118 (173 revisions) flutter/flutter@48c2475...bfc9041 2026-01-23 matt.kosarek@canonical.com No longer exiting the application when the RegularWindow is destroyed + resolving the window created promise after runWidget (flutter/flutter#181339) 2026-01-23 kazbek.sultanov.doc@gmail.com Remove unnecessary Material import from dialog_test.dart (flutter/flutter#181249) 2026-01-23 engine-flutter-autoroll@skia.org Roll Skia from 8e516fe6828f to db10db8bd55f (1 revision) (flutter/flutter#181379) 2026-01-23 50643541+Mairramer@users.noreply.github.com Reset TextFormField to initial value after state change (flutter/flutter#181199) 2026-01-23 engine-flutter-autoroll@skia.org Roll Dart SDK from 980b2b41d36e to e82d7ad1855e (1 revision) (flutter/flutter#181375) 2026-01-23 engine-flutter-autoroll@skia.org Roll Skia from 3e86f377d300 to 8e516fe6828f (4 revisions) (flutter/flutter#181370) 2026-01-23 kazbek.sultanov.doc@gmail.com Remove unnecessary Material import from sliver_visibility_test (flutter/flutter#181248) 2026-01-23 43635580+Lilian-C@users.noreply.github.com Add bottom navigation bar item semantics label (flutter/flutter#180577) 2026-01-23 58190796+MitchellGoodwin@users.noreply.github.com Make topGap not required for CupertinoSheetTransition (flutter/flutter#181269) 2026-01-23 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from b4cLyhuxciUC-4zCJ... to n7NohL9DPpEuPjNt9... (flutter/flutter#181365) 2026-01-23 engine-flutter-autoroll@skia.org Roll Dart SDK from 806f04638561 to 980b2b41d36e (1 revision) (flutter/flutter#181364) 2026-01-23 34871572+gmackall@users.noreply.github.com Reland hybrid views test (flutter/flutter#181336) 2026-01-23 git@reb0.org Revert DropdownMenu non-nullable breaking change (flutter/flutter#181074) 2026-01-23 dkwingsmt@users.noreply.github.com Fix leaks in `flutter_test` tests (flutter/flutter#180879) 2026-01-23 97480502+b-luk@users.noreply.github.com Re-enable fragment_shader_tests.dart 'Shader Compiler appropriately pads vec3 uniform arrays' test on Vulkan (flutter/flutter#181292) 2026-01-23 bkonyi@google.com [ Tool ] Fix `update-packages` failing due to mismatched dependencies between flutter_tools and the framework (flutter/flutter#181335) 2026-01-23 jason-simmons@users.noreply.github.com [Impeller] Make dynamically created shader metadata for runtime effects consistent with metadata for built-in shaders (flutter/flutter#181201) 2026-01-23 97480502+b-luk@users.noreply.github.com Broaden the applicability of `Color` fix_data rules from flutter/painting.dart (flutter/flutter#181093) 2026-01-23 15619084+vashworth@users.noreply.github.com Fixes macOS App.framework not being codesigned or find framework (flutter/flutter#181348) 2026-01-22 69134234+sutes-work@users.noreply.github.com Roll Fuchsia GN SDK from NAEC5tfgSl8g94nwp... to JLBh4Z9PKsjIJcqDU... (flutter/flutter#181139) 2026-01-22 engine-flutter-autoroll@skia.org Roll Dart SDK from ab4640ea82e9 to 806f04638561 (2 revisions) (flutter/flutter#181347) 2026-01-22 sokolovskyi.konstantin@gmail.com Add ExpansibleController.toggle method. (flutter/flutter#181320) 2026-01-22 42980667+srivats22@users.noreply.github.com Fixes Typo in codebase (flutter/flutter#181256) 2026-01-22 engine-flutter-autoroll@skia.org Roll Skia from 4766615bcc96 to 3e86f377d300 (3 revisions) (flutter/flutter#181346) 2026-01-22 ahmedsameha1@gmail.com Make sure that a Hero doesn't crash in 0x0 environment (flutter/flutter#180954) 2026-01-22 jason-simmons@users.noreply.github.com Reland "Fix capitalization of the path to FlutterWindowControllerTest.mm in the macOS platform build script" (flutter/flutter#181200) 2026-01-22 engine-flutter-autoroll@skia.org Roll Skia from 6e9746be8c4a to 4766615bcc96 (3 revisions) (flutter/flutter#181331) 2026-01-22 kazbek.sultanov.doc@gmail.com Fix remove material import textfield (flutter/flutter#181254) 2026-01-22 15619084+vashworth@users.noreply.github.com Add FlutterFramework as an Xcode SwiftPM local package override (flutter/flutter#179512) 2026-01-22 engine-flutter-autoroll@skia.org Roll Dart SDK from 7bd4c68b625c to ab4640ea82e9 (1 revision) (flutter/flutter#181324) 2026-01-22 engine-flutter-autoroll@skia.org Roll Packages from d80c60e to 9010299 (9 revisions) (flutter/flutter#181323) 2026-01-22 engine-flutter-autoroll@skia.org Roll Dart SDK from 2d53a77adc5d to 7bd4c68b625c (2 revisions) (flutter/flutter#181316) 2026-01-22 engine-flutter-autoroll@skia.org Roll Skia from 3f6949bc5780 to 6e9746be8c4a (2 revisions) (flutter/flutter#181311) 2026-01-22 engine-flutter-autoroll@skia.org Roll Skia from ef6efc358b4a to 3f6949bc5780 (2 revisions) (flutter/flutter#181307) 2026-01-22 engine-flutter-autoroll@skia.org Roll Dart SDK from 5d7c8faf2e41 to 2d53a77adc5d (1 revision) (flutter/flutter#181305) 2026-01-22 120639059+Enderjua@users.noreply.github.com [Material] update hourFormat to use Dart 3 switch expression (flutter/flutter#181041) 2026-01-22 146823759+brahim-guaali@users.noreply.github.com Use null-aware elements in cupertino/nav_bar.dart (flutter/flutter#181237) 2026-01-22 engine-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from b2KIEXVAlEqImQ9VO... to b4cLyhuxciUC-4zCJ... (flutter/flutter#181297) 2026-01-22 137456488+flutter-pub-roller-bot@users.noreply.github.com Roll pub packages (flutter/flutter#181295) 2026-01-22 30870216+gaaclarke@users.noreply.github.com Enables fragment shader test for impeller (fixes mat2 on vulkan) (flutter/flutter#181013) 2026-01-21 engine-flutter-autoroll@skia.org Roll Dart SDK from 366200db1aa1 to 5d7c8faf2e41 (4 revisions) (flutter/flutter#181290) 2026-01-21 engine-flutter-autoroll@skia.org Roll Skia from b5ec89e31f59 to ef6efc358b4a (19 revisions) (flutter/flutter#181289) 2026-01-21 brackenavaron@gmail.com fix description for semantics finders (flutter/flutter#181214) 2026-01-21 ahmedsameha1@gmail.com Make sure that an Icon doesn't crash in 0x0 environment (flutter/flutter#181021) 2026-01-21 ahmedsameha1@gmail.com Make sure that a GridPaper doesn't crash in 0x0 environment (flutter/flutter#180906) 2026-01-21 magder@google.com Bring Linux coverage out of bringup (flutter/flutter#181280) ...
Since the
widget_preview_scaffoldproject depends on both the Flutter SDK andflutter_tools,flutter_toolsmust use the same version pins as the Flutter SDK. This change ensures that any packages used by both the Flutter SDK andflutter_toolsuse the same pinned version.Fixes #180503