Upgrade Flutter, packages and Android build dependencies #1568

rajveermalviya · 2025-06-12T21:06:49Z

Reverts #1562, and includes cherry-picked commits from Chris's #1546 for RadioGroup API migration.

gnprice

Thanks for taking care of these! This all looks great, modulo two small comments below.

The #1545 fix will also need a few more changes now that #1517 has merged, as a sort of non-local merge conflict:
#1517 (comment)

Since it's fine for #1545 to wait until next week, and in the interest of getting the rest merged so it can go into a beta later today, I'll drop those three commits:
ccdacf9 Revert "settings [nfc]: Suppress some new deprecation warnings"
023f1e6 settings test: Check theme-setting radio buttons by checking what paints
ca3de6a settings: Migrate to new RadioGroup API for theme-setting radio buttons

and make the tweak for the other comment below. Then I'll go ahead and merge.

gnprice · 2025-06-12T22:54:02Z

lib/widgets/settings.dart

-              zulipLocalizations: zulipLocalizations)),
-            value: themeSettingOption,
-            // TODO(#1545) stop using the deprecated members
-            // ignore: deprecated_member_use


These ignores should get removed in the same commit that makes them no longer needed, rather than in a previous commit; otherwise the previous commit would enter a broken state.

gnprice · 2025-06-12T22:54:51Z

ios/Podfile.lock

-  - FirebaseMessaging (11.10.0):
-    - FirebaseCore (~> 11.10.0)
+  - FirebaseMessaging (11.13.0):
+    - FirebaseCore (~> 11.13.0)


Notable change is Firebase iOS SDK bump to 11.13.0, from 11.10.0, changelog for that is at: https://firebase.google.com/support/release-notes/ios No notable change there for FCM (the only component we use).

By my reading, there's no change there at all, right? Not just no notable change.

Yes, correct.

Thanks for confirming!

chrisbobbe · 2025-06-12T22:57:14Z

android/app/lint-baseline.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.5.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.5.2)" variant="all" version="8.5.2">
+<issues format="6" by="lint 8.10.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.10.0)" variant="all" version="8.10.0">

    <!--TODO(#855) see if this is no longer needed-->
    <issue
        id="InvalidPackage"
        message="Invalid package reference in library; not included in Android: `javax.xml.stream`. Referenced from `org.apache.tika.utils.XMLReaderUtils`.">
        <location
-            file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.apache.tika/tika-core/3.1.0/6ba44a9ddf8f6f2b4bc88e8bc64269aea0424607/tika-core-3.1.0.jar"/>
+            file="$GRADLE_USER_HOME/caches/modules-2/files-2.1/org.apache.tika/tika-core/3.2.0/9232bb3c71f231e8228f570071c0e1ea29d40115/tika-core-3.2.0.jar"/>
    </issue>

 </issues>


deps: Update file_picker to 10.2.0, from 10.1.9

I'm not following why the lint-baseline changes are necessary. At this commit, for me, tools/check android still fails with a similar-looking lint with what looks like the original location string (…3.2.0/9232bb…). Is there a command I should run?

I tried ./gradlew clean and rm -rf .gradle (after cd android) and reran; same result.

Hmm interesting. 3.2.0/9232bb… is the new location string, though, right?

Do you get the same failure in main?

[…] is the new location string, though, right?

Er oops, I think I copy-pasted from the wrong thing (the lint report showed two things (1) a suppression that wasn't used because nothing matched, and (2) an error that wasn't caught by a suppression, and they looked very similar).

Anyway, it's passing now; not sure what changed 🤷‍♂️ :

Lint found no errors or warnings 1 errors/warnings were listed in the baseline file (/Users/chrisbobbe/dev/zulip-flutter/android/app/lint-baseline.xml) but not found in the project; perhaps they have been fixed? Note: The baseline was created using a different target/variant than it was checked against. Creation variant: lint Current variant: lintVitalRelease

(So, LGTM; there's a "Note" there that we might investigate if there were time, but it doesn't seem to be about something broken.)

Sounds good; thanks for checking into it!

And update Flutter's supporting libraries to match.

Without this change, `flutter run` prints the following warning message: /…/zulip-flutter/l10n.yaml: The argument "synthetic-package" no longer has any effect and should be removed. See http://flutter.dev/to/flutter-gen-deprecation

Changelog: https://pub.dev/packages/flutter_lints/changelog#600 Also includes changes to fix lint failures for the new 'unnecessary_underscores' lint, probably to encourage using wildcard variable `_`: https://dart.dev/language/variables#wildcard-variables Without this change `flutter analyze` reports the following: info • Unnecessary use of multiple underscores • lib/widgets/autocomplete.dart:133:40 • unnecessary_underscores info • Unnecessary use of multiple underscores • lib/widgets/autocomplete.dart:156:38 • unnecessary_underscores info • Unnecessary use of multiple underscores • lib/widgets/autocomplete.dart:156:42 • unnecessary_underscores info • Unnecessary use of multiple underscores • lib/widgets/emoji_reaction.dart:333:34 • unnecessary_underscores

This commit is result of following commands: flutter pub upgrade --major-versions firebase_messaging firebase_core pod update --project-directory=ios/ pod update --project-directory=macos/ Changelogs: https://pub.dev/packages/firebase_core/changelog#3140 https://pub.dev/packages/firebase_messaging/changelog#1527 Notable change is Firebase iOS SDK bump to 11.13.0, from 11.10.0, changelog for that is at: https://firebase.google.com/support/release-notes/ios No changes there for FCM (the only component we use).

gnprice · 2025-06-13T00:29:35Z

Made those changes, and rebased resolving conflicts. I'll let CI run on the result before merging.

chrisbobbe · 2025-06-13T01:07:41Z

The CI failures are drift and pigeon; perhaps conflicts with the now-merged #1517 (which adds a setting) and #1379?

gnprice · 2025-06-13T01:11:58Z

Hmm, thanks. Running this now:
$ git rebase -i -x 'tools/check --fix --all-files drift pigeon'
(and using the -i to delete the tools/check steps after commits that seem like they couldn't be affected)

Changelog: https://pub.dev/packages/dart_style/changelog#310 This commit was produced by editing pubspec.yaml, then: $ flutter pub get $ ./tools/check --all-files --fix build_runner l10n drift pigeon

Changelog: https://pub.dev/packages/pigeon/changelog#2532

Changelog: https://pub.dev/packages/file_picker/changelog#1020 One bug fix on Android, for `saveFile`, which we don't use. Also, update lint-baseline.xml using `gradlew updateLintBaseline`.

The latest version (2.10.0) makes significant changes internally and to the test API, which would require us to investigate and update our FakeVideoPlayerPlatform mock for tests. So, pin to the currently used version for now.

Changelogs: https://docs.gradle.org/8.14.1/release-notes.html https://docs.gradle.org/8.14.2/release-notes.html The update includes couple of bug fixes as this is a minor version release.

Changelog: https://developer.android.com/build/releases/gradle-plugin#android-gradle-plugin-8.10.1 This update include couple of bug fixes.

gnprice · 2025-06-13T01:21:06Z

OK, that command fixed it for Drift.

For Pigeon… it ended up actually reverting the changes (which are only to the Pigeon version number written at the top of the file) in the two files that were already updated in that commit:
android/app/src/main/kotlin/com/zulip/flutter/AndroidNotifications.g.kt
lib/host/android_notifications.g.dart

As we've seen a couple of times before, it seems like there's some unfortunate caching going on in the Pigeon generator, or perhaps in build_runner underneath it.

So I just edited the affected file directly to bump that version number.

Let's see how CI goes on this version.

chrisbobbe · 2025-06-13T01:21:53Z

#622?

gnprice · 2025-06-13T01:22:25Z

Yeah, that looks like it — thanks for pulling it up.

chrisbobbe · 2025-06-13T01:49:41Z

Looks like CI passed! Please merge at will.

rajveermalviya force-pushed the pr-flutter-upgrade branch from 5e0585f to 0b95650 Compare June 12, 2025 21:13

rajveermalviya added the maintainer review PR ready for review by Zulip maintainers label Jun 12, 2025

chrisbobbe mentioned this pull request Jun 12, 2025

anchors n/n: Open at first unread #1517

Merged

gnprice reviewed Jun 12, 2025

View reviewed changes

chrisbobbe reviewed Jun 12, 2025

View reviewed changes

gnprice force-pushed the pr-flutter-upgrade branch from 0b95650 to 8c846f5 Compare June 13, 2025 00:22

rajveermalviya added 5 commits June 12, 2025 17:22

deps: Upgrade Flutter to 3.33.0-1.0.pre.465

b7646c7

And update Flutter's supporting libraries to match.

deps: Update CocoaPods pods (tools/upgrade pod)

8f2b647

gnprice force-pushed the pr-flutter-upgrade branch from 8c846f5 to 2ff1abe Compare June 13, 2025 00:29

rajveermalviya added 7 commits June 12, 2025 18:13

deps: Update dart_style to 3.1.0, from 3.0.1

2566f02

Changelog: https://pub.dev/packages/dart_style/changelog#310 This commit was produced by editing pubspec.yaml, then: $ flutter pub get $ ./tools/check --all-files --fix build_runner l10n drift pigeon

deps: Update pigeon to 25.3.2, from 25.3.1

5692788

Changelog: https://pub.dev/packages/pigeon/changelog#2532

deps: Update file_picker to 10.2.0, from 10.1.9

6527846

Changelog: https://pub.dev/packages/file_picker/changelog#1020 One bug fix on Android, for `saveFile`, which we don't use. Also, update lint-baseline.xml using `gradlew updateLintBaseline`.

deps: Pin video_player to 2.9.5

2036178

The latest version (2.10.0) makes significant changes internally and to the test API, which would require us to investigate and update our FakeVideoPlayerPlatform mock for tests. So, pin to the currently used version for now.

deps: Upgrade packages within constraints (tools/upgrade pub)

32401c6

deps android: Upgrade Gradle to 8.14.2, from 8.14

57ccaca

Changelogs: https://docs.gradle.org/8.14.1/release-notes.html https://docs.gradle.org/8.14.2/release-notes.html The update includes couple of bug fixes as this is a minor version release.

deps android: Upgrade Android Gradle Plugin to 8.10.1, from 8.10.0

3ef9de6

Changelog: https://developer.android.com/build/releases/gradle-plugin#android-gradle-plugin-8.10.1 This update include couple of bug fixes.

gnprice force-pushed the pr-flutter-upgrade branch from 2ff1abe to 3ef9de6 Compare June 13, 2025 01:20

This was referenced Jun 13, 2025

tools/check: pigeon runs old/cached version of Pigeon after Pigeon dependency is upgraded #622

Open

local echo (7/7): Support simplified version of local echo #1453

Merged

gnprice merged commit 3ef9de6 into zulip:main Jun 13, 2025
1 check passed

rajveermalviya deleted the pr-flutter-upgrade branch June 13, 2025 05:57

Upgrade Flutter, packages and Android build dependencies #1568

Upgrade Flutter, packages and Android build dependencies #1568

Uh oh!

Conversation

rajveermalviya commented Jun 12, 2025

Uh oh!

gnprice left a comment

Choose a reason for hiding this comment

Uh oh!

gnprice Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

gnprice Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

rajveermalviya Jun 13, 2025

Choose a reason for hiding this comment

Uh oh!

gnprice Jun 13, 2025

Choose a reason for hiding this comment

Uh oh!

chrisbobbe Jun 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chrisbobbe Jun 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gnprice Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

chrisbobbe Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

chrisbobbe Jun 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gnprice Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

gnprice commented Jun 13, 2025

Uh oh!

chrisbobbe commented Jun 13, 2025

Uh oh!

gnprice commented Jun 13, 2025

Uh oh!

gnprice commented Jun 13, 2025

Uh oh!

chrisbobbe commented Jun 13, 2025

Uh oh!

gnprice commented Jun 13, 2025

Uh oh!

chrisbobbe commented Jun 13, 2025

Uh oh!

Uh oh!

Uh oh!

chrisbobbe Jun 12, 2025 •

edited

Loading

chrisbobbe Jun 12, 2025 •

edited

Loading

chrisbobbe Jun 12, 2025 •

edited

Loading