Upgrade all[most] androidx dependencies to latest by gmackall · Pull Request #53001 · flutter/engine

gmackall · 2024-05-23T17:48:31Z

Upgrades every androidx dependency in the src/third_party/android_embedding_dependencies bundle to the latest version, except the lifecycle group*. Tested running a couple of apps as well because when updating these dependencies in the past I've been able to build the engine but then flutter run fail when trying to run an app.

Fixes flutter/flutter#129307, also unblocks a feature that will eventually be needed for Scribe.

[*]2.8.0 is the latest there, but I ran into an issue with dexing when I tried to upgrade, due to b/336164417, an AGP bug that had its fix backported to all >8.0.0 versions, but we still support less than that so we will have to wait on that upgrade.

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
I listed at least one issue that this PR fixes in the description above.
I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
I updated/added relevant documentation (doc comments with ///).
I signed the CLA.
All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

…sue that wasn't backported to agp <8

… into androidx_core_1.13

justinmc

I don't know enough about our build dependencies to truly LGTM this, but it looks good for my needs. The Scribe PR that needs this is #52943, where I'd like to be able to call things like EditorInfoCompat#setStylusHandwritingEnabled. Thanks for doing this!

yaakovschectman · 2024-05-24T19:13:40Z

Looks good as far as I can tell, but I don't think I'm in the best position to actually approve it.

…gine#53001)

eyebrowsoffire · 2024-05-28T19:02:37Z

Revert reason: flutter/flutter#149203

auto-submit · 2024-05-28T19:03:13Z

A reason for requesting a revert of flutter/engine/53001 could
not be found or the reason was not properly formatted. Begin a comment with 'Reason for revert:' to tell the bot why
this issue is being reverted.

…gine#53001)

eyebrowsoffire · 2024-05-28T21:01:48Z

I'll make a manual revert

…gine#53001)

)" This reverts commit 00e72e9.

…gine#53001)

Revert label failed due to conflicts `FlutterFragmentTest.java` was the only file that had merge issues, everything else is the output of `git revert 00e72e9` [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style

…gine#53001)

…49220) Manual roll requested by jacksongardner@google.com flutter/engine@d032390...b26e1b0 2024-05-28 34871572+gmackall@users.noreply.github.com Manual revert of #53001 (flutter/engine#53075) 2024-05-28 chinmaygarde@google.com Remove --ios-cpu flag. Only the arm64 variant is supported. (flutter/engine#53044) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 229d94a8807e to ac454b80130c (1 revision) (flutter/engine#53074) 2024-05-28 jonahwilliams@google.com [Impeller] make strokes slightly lighter. (flutter/engine#53067) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 23ddbb590e44 to 229d94a8807e (2 revisions) (flutter/engine#53071) 2024-05-28 jmccandless@google.com FlutterFragment predictive back (flutter/engine#52302) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 02c359cf8233 to 23ddbb590e44 (2 revisions) (flutter/engine#53070) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 4f91b3865441 to 02c359cf8233 (1 revision) (flutter/engine#53069) 2024-05-28 30870216+gaaclarke@users.noreply.github.com [Impeller] shrunk the buffer for the rrect_blur (flutter/engine#53068) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 91cd2b48377a to 4f91b3865441 (4 revisions) (flutter/engine#53066) 2024-05-28 34871572+gmackall@users.noreply.github.com Upgrade all[most] androidx dependencies to latest (flutter/engine#53001) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 0c2c490021b7 to 91cd2b48377a (3 revisions) (flutter/engine#53065) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 545203f95d4e to 0c2c490021b7 (2 revisions) (flutter/engine#53063) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 74b4d97be6ab to 545203f95d4e (1 revision) (flutter/engine#53062) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 848d9498fd68 to 74b4d97be6ab (1 revision) (flutter/engine#53061) 2024-05-28 johnniwinther@google.com Remove use of --nnbd-agnostic (flutter/engine#53055) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC jacksongardner@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

…utter#149220) Manual roll requested by jacksongardner@google.com flutter/engine@d032390...b26e1b0 2024-05-28 34871572+gmackall@users.noreply.github.com Manual revert of flutter#53001 (flutter/engine#53075) 2024-05-28 chinmaygarde@google.com Remove --ios-cpu flag. Only the arm64 variant is supported. (flutter/engine#53044) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 229d94a8807e to ac454b80130c (1 revision) (flutter/engine#53074) 2024-05-28 jonahwilliams@google.com [Impeller] make strokes slightly lighter. (flutter/engine#53067) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 23ddbb590e44 to 229d94a8807e (2 revisions) (flutter/engine#53071) 2024-05-28 jmccandless@google.com FlutterFragment predictive back (flutter/engine#52302) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 02c359cf8233 to 23ddbb590e44 (2 revisions) (flutter/engine#53070) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 4f91b3865441 to 02c359cf8233 (1 revision) (flutter/engine#53069) 2024-05-28 30870216+gaaclarke@users.noreply.github.com [Impeller] shrunk the buffer for the rrect_blur (flutter/engine#53068) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 91cd2b48377a to 4f91b3865441 (4 revisions) (flutter/engine#53066) 2024-05-28 34871572+gmackall@users.noreply.github.com Upgrade all[most] androidx dependencies to latest (flutter/engine#53001) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 0c2c490021b7 to 91cd2b48377a (3 revisions) (flutter/engine#53065) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 545203f95d4e to 0c2c490021b7 (2 revisions) (flutter/engine#53063) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 74b4d97be6ab to 545203f95d4e (1 revision) (flutter/engine#53062) 2024-05-28 skia-flutter-autoroll@skia.org Roll Skia from 848d9498fd68 to 74b4d97be6ab (1 revision) (flutter/engine#53061) 2024-05-28 johnniwinther@google.com Remove use of --nnbd-agnostic (flutter/engine#53055) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-engine-flutter-autoroll Please CC jacksongardner@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

This reverts commit b26e1b0.

…0, and Fix test failures blocking androidx upgrade (#149204) PR to pave the way for flutter/engine#53001 to re-land Summary: - Enforces use of Kotlin >= `1.7.0` (please see below note) - Fixes ci failures that prevented the above PR from landing. Details: Because it landed initially, we are able to fake the roll in this PR to fix all the tests ([see my comment](#149204 (comment))). Fixes all the tests that failed: 1. `module_test` failing on multiple platforms (3/9 of the failures). Failure is ``` > Android resource linking failed ERROR:/b/s/w/ir/x/t/flutter_module_test.KECMXW/hello/.android/plugins_build_output/device_info/intermediates/merged_res/release/values/values.xml:194: AAPT: error: resource android:attr/lStar not found. ``` This is a rather unhelpful error message but some [folks online suggest](https://stackoverflow.com/a/69050529) that upgrading your `compileSdk` version fixes this. These resolve when I remove the dependency on the long discontinued [package_info](https://pub.dev/packages/package_info) and [device_info](https://pub.dev/packages/device_info) packages, perhaps because they are transitively pulling in low `compileSdk` versions? This is unclear to me. 2. `module_custom_host_app_name_test` was failing for the same reason (another 3/9, or cumulative 6/9). 3. `tool_integration_tests_3_4` was a flake ð�� (7/9) 4. `framework_tests_slow` needed a newer version of the Kotlin Gradle plugin (the flutter tool tells us this, so I just upgraded as suggested) and it resolved (8/9) 5.`android_preview_tool_integration_tests` needed newer AGP and KGP versions. I also refactored the tests, and bumped our error versions, fixing #142653. **Note that the bump to KGP is not in line with our policy** - we didn't warn for `1.5.0-1.6.x` for a release (or at all) before dropping support. But I think it might still be justified: - The bump to our androidx libraries unblocks ongoing Scribe work, and also includes a fix for a [memory leak](#129307 (comment)) and a [crash on folding phones](#114868 (comment)), among many other bug fixes. - Gradle [doesn't test on half of that range](https://docs.gradle.org/current/userguide/compatibility.html#kotlin), and so we implicitly can't claim to support it either. More generally, our Java and Kotlin support ranges should probably strictly fall within what Gradle tests.

@matanlurey

Relands #53001. Also pulls in @matanlurey's dependency on `androidx.lifecycle:lifecycle-process`, and upgrades it to `2.7.0`. It is unblocked by the changes in flutter/flutter#149204. Tested by building the engine, and then also by building the `flutter/packages` `all_packages` app on this branch, so that hopefully it will also roll smoothly into the packages repo. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style

@matanlurey

…53462)" (#53468) Reverts: #53462 Initiated by: gmackall Reason for reverting: blocking roll (see flutter/flutter#150465 (comment)). Original PR Author: gmackall Reviewed By: {reidbaker} This change reverts the following previous change: Relands #53001. Also pulls in @matanlurey's dependency on `androidx.lifecycle:lifecycle-process`, and upgrades it to `2.7.0`. It is unblocked by the changes in flutter/flutter#149204. Tested by building the engine, and then also by building the `flutter/packages` `all_packages` app on this branch, so that hopefully it will also roll smoothly into the packages repo. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style

Re-re-land #53001 (Reland attempt was at #53462) Unblocked by flutter/flutter#150585, but will still need a manual roll because I will need to re-generate a bunch of lockfiles. Also, https://github.com/flutter/flutter/blob/master/docs/engine/Testing-presubmit-Engine-PRs-with-the-Flutter-framework.md doesn't work (it's blocked on flutter/flutter#149780) so I mostly just have to pray that no new issues occur in the roll. But I believe all issues that came up in the last attempt should be addressed by the above pr and by manual lockfile generation. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style

…t" (#53532)" (#53546) Reverts: #53532 Initiated by: gmackall Reason for reverting: This breaks apps that use plugins that use compileSdk 31, some of which we use in our postsubmit (so it blocks the tree). Original PR Author: gmackall Reviewed By: {reidbaker, matanlurey} This change reverts the following previous change: Re-re-land #53001 (Reland attempt was at #53462) Unblocked by flutter/flutter#150585, but will still need a manual roll because I will need to re-generate a bunch of lockfiles. Also, https://github.com/flutter/flutter/blob/master/docs/engine/Testing-presubmit-Engine-PRs-with-the-Flutter-framework.md doesn't work (it's blocked on flutter/flutter#149780) so I mostly just have to pray that no new issues occur in the roll. But I believe all issues that came up in the last attempt should be addressed by the above pr and by manual lockfile generation. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style

Removes the `dual_screen` package from `new_gallery`. Unblocks the fourth attempt to land flutter/engine#53001.

…50808)" (#150871) Reverts: #150808 Initiated by: gmackall Reason for reverting: Causing the new_gallery tests to hang. I can repro now though, so should be able to find a fix shortly Original PR Author: gmackall Reviewed By: {christopherfujino, johnmccutchan, jtmcdole, jonahwilliams} This change reverts the following previous change: Removes the `dual_screen` package from `new_gallery`. Unblocks the fourth attempt to land flutter/engine#53001.

…3592) Re-re-re-land #53001. I recreated the postsubmit failures of the [roll](flutter/flutter#150733) of the [last land](#53532), and then verified on a local branch that those same postsubmits pass with this upgrade after the land of flutter/flutter#150873. So I have pretty high confidence this won't cause any problems in the framework repo. I also tested on a previous land attempt that the `all_packages` app builds on this branch, so that is also a good sign for the packages repo. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style

Gray Mackall added 4 commits May 22, 2024 16:48

wip of upgrade to all androidx dependencies

f99b23f

downgrade lifecycle deps from 2.8.0 to 2.7.0 due to java 21 dexing is…

e6d7186

…sue that wasn't backported to agp <8

DEPS update

2237b72

undo local changes to android embedding build.gradle

c0bab8d

github-actions bot added the platform-android label May 23, 2024

gmackall changed the title ~~Upgrade all[most] all androidx dependencies to latest~~ Upgrade all[most] androidx dependencies to latest May 23, 2024

Gray Mackall and others added 4 commits May 23, 2024 11:40

fix random deprecation

1f6bdce

Merge branch 'main' into androidx_core_1.13

69fd36c

Merge remote-tracking branch 'refs/remotes/origin/androidx_core_1.13'…

465dba1

… into androidx_core_1.13

whitespace

1637f60

gmackall marked this pull request as ready for review May 23, 2024 19:30

gmackall requested a review from a team May 23, 2024 19:31

gmackall mentioned this pull request May 23, 2024

Migrate androidx.window to 1.1.0 stable #52474

Closed

7 tasks

justinmc reviewed May 23, 2024

View reviewed changes

reidbaker approved these changes May 28, 2024

View reviewed changes

gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label May 28, 2024

auto-submit bot merged commit 00e72e9 into flutter:main May 28, 2024

engine-flutter-autoroll mentioned this pull request May 28, 2024

Roll Flutter Engine from d0323905fc2f to 00e72e9cecb1 (6 revisions) flutter/flutter#149195

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 28, 2024

00e72e9 Upgrade all[most] androidx dependencies to latest (flutter/en…

0112743

…gine#53001)

engine-flutter-autoroll mentioned this pull request May 28, 2024

Roll Flutter Engine from d0323905fc2f to 2feb07c76d34 (7 revisions) flutter/flutter#149200

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 28, 2024

00e72e9 Upgrade all[most] androidx dependencies to latest (flutter/en…

7a491eb

…gine#53001)

eyebrowsoffire mentioned this pull request May 28, 2024

Engine -> Framework roll failing on multiple CI steps with gradle-related failures flutter/flutter#149203

Closed

eyebrowsoffire added the revert Label used to revert changes in a closed and merged pull request. label May 28, 2024

auto-submit bot removed the revert Label used to revert changes in a closed and merged pull request. label May 28, 2024

gmackall mentioned this pull request May 28, 2024

Make flutter tool enforce >= kotlin 1.7.0, Gradle 7.0.2, and AGP 7.0.0, and Fix test failures blocking androidx upgrade flutter/flutter#149204

Merged

9 tasks

engine-flutter-autoroll mentioned this pull request May 28, 2024

Roll Flutter Engine from d0323905fc2f to 414229bc8a1a (8 revisions) flutter/flutter#149205

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 28, 2024

00e72e9 Upgrade all[most] androidx dependencies to latest (flutter/en…

ebaa7e5

…gine#53001)

engine-flutter-autoroll mentioned this pull request May 28, 2024

Roll Flutter Engine from d0323905fc2f to c364b294c1f3 (11 revisions) flutter/flutter#149213

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 28, 2024

00e72e9 Upgrade all[most] androidx dependencies to latest (flutter/en…

f65d63d

…gine#53001)

engine-flutter-autoroll mentioned this pull request May 28, 2024

Roll Flutter Engine from d0323905fc2f to dd019f6d111d (12 revisions) flutter/flutter#149215

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 28, 2024

00e72e9 Upgrade all[most] androidx dependencies to latest (flutter/en…

ff5f598

…gine#53001)

eyebrowsoffire added a commit to eyebrowsoffire/engine that referenced this pull request May 28, 2024

Revert "Upgrade all[most] androidx dependencies to latest (flutter#53001

f65d6e8

)" This reverts commit 00e72e9.

engine-flutter-autoroll mentioned this pull request May 28, 2024

Roll Flutter Engine from d0323905fc2f to 06944ac16662 (13 revisions) flutter/flutter#149217

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 28, 2024

00e72e9 Upgrade all[most] androidx dependencies to latest (flutter/en…

1329d51

…gine#53001)

engine-flutter-autoroll mentioned this pull request May 29, 2024

Manual roll Flutter Engine from d0323905fc2f to b26e1b023cdb (16 revisions) flutter/flutter#149220

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request May 29, 2024

00e72e9 Upgrade all[most] androidx dependencies to latest (flutter/en…

3d7b9ad

…gine#53001)

gmackall mentioned this pull request Jun 12, 2024

[image_picker]: Bump org.jetbrains.kotlin:kotlin-bom from 1.8.22 to 1.9.22 in /packages/image_picker/image_picker_android/android flutter/packages#5752

Closed

gmackall pushed a commit to gmackall/engine that referenced this pull request Jun 18, 2024

Revert "Manual revert of flutter#53001 (flutter#53075)"

852b9fa

This reverts commit b26e1b0.

gmackall mentioned this pull request Jun 18, 2024

Reland "Upgrade all[most] androidx dependencies to latest" #53462

Merged

8 tasks

auto-submit bot mentioned this pull request Jun 19, 2024

Reverts "Reland "Upgrade all[most] androidx dependencies to latest" (#53462)" #53468

Merged

8 tasks

gmackall mentioned this pull request Jun 24, 2024

Re-re-land "Upgrade all[most] androidx dependencies to latest" #53532

Merged

8 tasks

auto-submit bot mentioned this pull request Jun 25, 2024

Reverts "Re-re-land "Upgrade all[most] androidx dependencies to latest" (#53532)" #53546

Merged

8 tasks

gmackall mentioned this pull request Jun 25, 2024

Remove dual_screen from new_gallery integration test flutter/flutter#150808

Merged

9 tasks

auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jun 26, 2024

Remove dual_screen from new_gallery integration test (#150808)

1d13676

Removes the `dual_screen` package from `new_gallery`. Unblocks the fourth attempt to land flutter/engine#53001.

gmackall mentioned this pull request Jun 26, 2024

Re-re-re-land "Upgrade all[most] androidx dependencies to latest" #53592

Merged

8 tasks

auto-submit bot mentioned this pull request Jun 26, 2024

Reverts "Remove dual_screen from new_gallery integration test (#150808)" flutter/flutter#150871

Merged

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade all[most] androidx dependencies to latest#53001

Upgrade all[most] androidx dependencies to latest#53001
auto-submit[bot] merged 8 commits intoflutter:mainfrom
gmackall:androidx_core_1.13

gmackall commented May 23, 2024 •

edited

Loading

Uh oh!

justinmc left a comment

Uh oh!

yaakovschectman commented May 24, 2024

Uh oh!

eyebrowsoffire commented May 28, 2024

Uh oh!

auto-submit bot commented May 28, 2024

Uh oh!

eyebrowsoffire commented May 28, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

gmackall commented May 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-launch Checklist

Uh oh!

justinmc left a comment

Choose a reason for hiding this comment

Uh oh!

yaakovschectman commented May 24, 2024

Uh oh!

eyebrowsoffire commented May 28, 2024

Uh oh!

auto-submit bot commented May 28, 2024

Uh oh!

eyebrowsoffire commented May 28, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

gmackall commented May 23, 2024 •

edited

Loading