Upgrade Flutter, packages and Android build dependencies

[rajveermalviya]

Most notable commits in Flutter:

• Flutter Notable Commits - 2025 flutter/flutter#161460 (comment)
• Flutter Notable Commits - 2025 flutter/flutter#161460 (comment)
• Flutter Notable Commits - 2025 flutter/flutter#161460 (comment)

[chrisbobbe]

LGTM, thanks! Marking for Greg's review.

[gnprice]

Thanks! Looks good, except one comment below.

[gnprice]

ios build: Take auto updates to Podfile.lock

This commit is a result of running `flutter run`.

Probably a side-effect of the change in
37dc9eaa441f893417e8bf048e989f7f892fae85.

There are two changes in this commit, and probably only one of them is related to that previous commit, right? Namely the "PODFILE CHECKSUM" change. (I believe we discussed this on a recent call.)

This change to the Flutter hash is presumably instead due to the last couple of Flutter upgrades (which I made without running on iOS).

The commit's changes are fine, but let's say a few more words to distinguish which change we're attributing to what cause.

[rajveermalviya]

Thanks for the reviews! Pushed an update @gnprice, PTAL.

[gnprice]

Thanks! That first commit message looks good now. But it seems like the new revision makes a smaller Flutter upgrade than the previous revision:

$ git range-diff origin pr/1504@{{1,0}}
[…]
2:  a0427063c ! 2:  ed4d55850 deps: Upgrade Flutter to 3.33.0-1.0.pre.44
    @@ Metadata
     Author: Rajesh Malviya <[email protected]>
     
      ## Commit message ##
    -    deps: Upgrade Flutter to 3.33.0-1.0.pre.44
    +    deps: Upgrade Flutter to 3.32.0-1.0.pre.446
     
      ## macos/Podfile.lock ##
     @@ macos/Podfile.lock: SPEC CHECKSUMS:
    @@ pubspec.lock: packages:
      sdks:
     -  dart: ">=3.9.0-63.0.dev <4.0.0"
     -  flutter: ">=3.32.0-1.0.pre.332"
    -+  dart: ">=3.9.0-114.0.dev <4.0.0"
    -+  flutter: ">=3.33.0-1.0.pre.44"
    ++  dart: ">=3.9.0-97.0.dev <4.0.0"
    ++  flutter: ">=3.32.0-1.0.pre.446"
     
      ## pubspec.yaml ##
     @@ pubspec.yaml: environment:
        # We use a recent version of Flutter from its main channel, and
        # the corresponding recent version of the Dart SDK.
        # Feel free to update these regularly; see README.md for instructions.
     -  sdk: '>=3.9.0-63.0.dev <4.0.0'
     -  flutter: '>=3.32.0-1.0.pre.332'  # adae8bbdbaed53ef305726fcfe811b2351d73a1a
    -+  sdk: '>=3.9.0-114.0.dev <4.0.0'
    -+  flutter: '>=3.33.0-1.0.pre.44'  # 358b0726882869cd917e1e2dc07b6c298e6c2992
    ++  sdk: '>=3.9.0-97.0.dev <4.0.0'
    ++  flutter: '>=3.32.0-1.0.pre.446'  # 3a71fefdcaf1ce569dfab580db81e48894696bfb

Was that intended?

[gnprice]

(I'd imagined using git rebase -i to just edit the first commit message, not rerunning tools/upgrade or making any other edits to the later commits.)

[rajveermalviya]

Was that intended?

I'd imagined using git rebase -i to just edit the first commit message, not rerunning tools/upgrade or making any other edits to the later commits.

That was definitely unintended and a bad rebase because I'd done exactly that, only reword-ed the first commit message, but not sure what resulted in all the unintended changes.

Just tried to do it again with the previous revision, and saw this error, even when I did not have any local changes/unstaged files:

error: Your local changes to the following files would be overwritten by merge:
        pubspec.lock
Please commit your changes or stash them before you merge.
Aborting
hint: Could not execute the todo command
hint:
hint:     pick a0427063cc92075a15667c045b54d1fa6b2df6d6 deps: Upgrade Flutter to 3.33.0-1.0.pre.44
hint:
hint: It has been rescheduled; To edit the command before continuing, please
hint: edit the todo list first:
hint:
hint:     git rebase --edit-todo
hint:     git rebase --continue

Previously I think I did git rebase --continue after seeing this message which resulted in the bad rebase, but now I did git rebase --edit-todo then exited the editor without any changes and then ran git rebase --continue again, and now surprisingly the state of the branch seems correct. So pushed that now.