Skip to content

deps: Upgrade Flutter to 3.33.0-1.0.pre-1085 #1763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 29, 2025

Conversation

gnprice
Copy link
Member

@gnprice gnprice commented Jul 28, 2025

And update Flutter's supporting libraries to match.

In particular this gets us TransitionDurationObserver:
flutter/flutter#171109

We stop just before a certain Dart SDK roll:
flutter/flutter@fa80cbcbdbdd
because that commit breaks completion in the IDE, which would be pretty annoying for doing development. Thanks to Sayed for spotting that breakage and bisecting it to that commit:
#1755 (comment)
https://chat.zulip.org/#narrow/channel/516-mobile-dev-help/topic/New.20Flutter.20upgrade.20degrades.20code.20autocompletion/near/2230721

@gnprice
Copy link
Member Author

gnprice commented Jul 28, 2025

CI failed in our flutter_version check:

Running flutter_version...
error: Flutter commit in pubspec.yaml seems to differ from version bound
Commit b46957fb06ffbd8590caa8590f1a0b06a71fc609 was described as: 3.33.0-0.0.pre-1085-gb46957fb
We therefore expect the Flutter version name to be: 3.33.0-1.0.pre.1085
But the Flutter version bound in pubspec.yaml is: 3.33.0-1.0.pre-1085

The dash is how flutter --version now formats the version, though:

$ flutter --version | cat
Flutter 3.33.0-1.0.pre-1085 • channel main • https://github.com/flutter/flutter.git
Framework • revision b46957fb06 (5 days ago) • 2025-07-23 13:35:08 -0400
Engine • hash 9aa877987921faf059f2bad643175ba79b1dc283 (revision 1f65ef4e60) (5 days ago) • 2025-07-23 17:21:09.000Z
Tools • Dart 3.10.0 (build 3.10.0-15.0.dev) • DevTools 2.48.0

So the right fix might be to update that bit of tools/check to expect the new format.

I'll first spend a few minutes trying to pin down how and where the format changed, though, mostly to validate that this seems like an intentional change which we can expect to persist.

@gnprice
Copy link
Member Author

gnprice commented Jul 28, 2025

Aha, yep: flutter/flutter#172141

[ Tool ] Fix `flutter upgrade` stating that an upgrade is available on `main` when up to date (#172141)

The `frameworkVersion` string written to the version files wasn't
actually parsable by `GitTagVersion` as it didn't match the format
output by `git`.

This change updates the `frameworkVersion` format to use a `-` instead
of a `.` before the commit count and adds support to the version parsing
regex to handle both `.` and `-` separators before the commit count.

Fixes https://github.com/flutter/flutter/issues/172091

Seems reasonable, and a reason that's likely to persist.

I'll probably have tools/check accept either format, though, in case it changes back.

@chrisbobbe
Copy link
Collaborator

Thanks, LGTM! Please merge at will.

gnprice added 2 commits July 28, 2025 18:25
These changed in a recent upstream PR to look a bit more like
the output of `git describe`:
  flutter/flutter#172141

That causes an upgrade by `tools/upgrade flutter-local` past that
upstream change to break an assumption made by this check; the check
notices that up front, and sensibly fails.

So update the check to accept both ways.
And update Flutter's supporting libraries to match.

In particular this gets us TransitionDurationObserver:
  flutter/flutter#171109

We stop just before a certain Dart SDK roll:
  flutter/flutter@fa80cbcbdbdd
because that commit breaks completion in the IDE, which would be
pretty annoying for doing development.  Thanks to Sayed for
spotting that breakage and bisecting it to that commit:
  zulip#1755 (comment)
  https://chat.zulip.org/#narrow/channel/516-mobile-dev-help/topic/New.20Flutter.20upgrade.20degrades.20code.20autocompletion/near/2230721
@gnprice gnprice merged commit 6c0c1d8 into zulip:main Jul 29, 2025
1 check passed
@gnprice gnprice deleted the pr-flutter-bump branch July 29, 2025 01:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintainer review PR ready for review by Zulip maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants