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

gmackall · 2024-06-24T16:23:20Z

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.

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.

reidbaker · 2024-06-24T20:30:03Z

testing/scenario_app/android/app/build.gradle

@@ -16,7 +17,7 @@ android {
        // NewerVersionAvailable and GradleDependency need to be taken care of
        // by a roller rather than as part of CI.
        // The others are irrelevant for a test application.
-        disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered'
+        disable 'UnpackedNativeCode','MissingApplicationIcon','GoogleAppIndexingApiWarning','GoogleAppIndexingWarning','GradleDependency','NewerVersionAvailable','Registered', 'ObsoleteLintCustomCheck'


Can you add a comment why this was added?

Hmm I can't remember at this point, as the original pr was a while ago. I'll try removing.

…' into re-re-land-androidx

…st" (flutter/engine#53532)

Manual engine roll to flutter/engine#53532, because the roll requires lockfile generation.

gmackall · 2024-06-25T01:16:03Z

Reason for revert: This breaks apps that use plugins that use compileSdk 31, some of which we use in our postsubmit (so it blocks the tree).

#53532)" This reverts commit 6884e83.

Reverts: #150733 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: {jason-simmons} This change reverts the following previous change: Manual engine roll to flutter/engine#53532, because the roll requires lockfile generation.

…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

…st" (flutter/engine#53532)

…150762) flutter/engine@be7db94...afa7ce1 2024-06-25 [email protected] Roll Dart SDK from bb18127b2a8e to b5fc85cfcf1b (1 revision) (flutter/engine#53552) 2024-06-25 [email protected] Roll Skia from 5feca3095719 to 335200e57c26 (1 revision) (flutter/engine#53549) 2024-06-25 [email protected] Roll Dart SDK from c187d4b3ec88 to bb18127b2a8e (1 revision) (flutter/engine#53547) 2024-06-25 [email protected] Roll Fuchsia Linux SDK from _6HNhJ6G59VMceKoN... to WUN7NQK04NjF9fRmf... (flutter/engine#53545) 2024-06-25 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Re-re-land "Upgrade all[most] androidx dependencies to latest" (#53532)" (flutter/engine#53546) 2024-06-25 [email protected] Bump impeller-cmake-example (flutter/engine#53538) 2024-06-24 [email protected] Roll Skia from e20c8b0bac0c to 5feca3095719 (1 revision) (flutter/engine#53544) 2024-06-24 [email protected] [web] Reland "Fix focus management for text fields (#51009)" (flutter/engine#53537) 2024-06-24 [email protected] Roll Dart SDK from 5df89347bddf to c187d4b3ec88 (1 revision) (flutter/engine#53542) 2024-06-24 [email protected] [macOS] Generate universal gen_snapshots (flutter/engine#53524) 2024-06-24 [email protected] Re-re-land "Upgrade all[most] androidx dependencies to latest" (flutter/engine#53532) 2024-06-24 [email protected] Roll Skia from 1948fd53e280 to e20c8b0bac0c (1 revision) (flutter/engine#53540) 2024-06-24 [email protected] Roll Skia from 0fa58b6ddba0 to 1948fd53e280 (2 revisions) (flutter/engine#53536) 2024-06-24 [email protected] Roll Skia from ea84df425483 to 0fa58b6ddba0 (3 revisions) (flutter/engine#53535) 2024-06-24 [email protected] [Impeller] added a fallback that will make sure the blur fragment shader doesn't overflow (flutter/engine#53466) 2024-06-24 [email protected] [fuchsia] Update Fuchsia API level to 19 (flutter/engine#53494) 2024-06-24 [email protected] Roll Dart SDK from 95470b2cac1f to 5df89347bddf (1 revision) (flutter/engine#53534) 2024-06-24 [email protected] Roll Skia from f6b4344d73cc to ea84df425483 (1 revision) (flutter/engine#53531) Also rolling transitive DEPS: fuchsia/sdk/core/linux-amd64 from _6HNhJ6G59VM to WUN7NQK04NjF 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 [email protected],[email protected],[email protected] 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

Manual engine roll to flutter/engine#53532, because the roll requires lockfile generation.

) Reverts: flutter#150733 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: {jason-simmons} This change reverts the following previous change: Manual engine roll to flutter/engine#53532, because the roll requires lockfile generation.

…to latest" (flutter#53532)" (flutter#53546)" This reverts commit a07ba90.

…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

reland androidx upgrade

ef27c8c

github-actions bot added the platform-android label Jun 24, 2024

gmackall changed the title ~~reland androidx upgrade~~ Re-re-land Jun 24, 2024

gmackall changed the title ~~Re-re-land~~ Re-re-land "Upgrade all[most] androidx dependencies to latest" Jun 24, 2024

gmackall mentioned this pull request Jun 24, 2024

Engine roll mock flutter/flutter#150704

Closed

9 tasks

Merge branch 'main' into re-re-land-androidx

391d007

gmackall marked this pull request as ready for review June 24, 2024 20:22

gmackall requested review from matanlurey and a team June 24, 2024 20:24

matanlurey approved these changes Jun 24, 2024

View reviewed changes

reidbaker reviewed Jun 24, 2024

View reviewed changes

reidbaker approved these changes Jun 24, 2024

View reviewed changes

Gray Mackall added 2 commits June 24, 2024 13:50

remove disabling of ObsoleteLintCustomCheck

efd333d

Merge remote-tracking branch 'refs/remotes/origin/re-re-land-androidx…

4ccbf11

…' into re-re-land-androidx

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

auto-submit bot merged commit 6884e83 into flutter:main Jun 24, 2024
33 checks passed

gmackall mentioned this pull request Jun 24, 2024

Manual engine roll to 6884e83 flutter/flutter#150733

Merged

9 tasks

engine-flutter-autoroll mentioned this pull request Jun 24, 2024

Roll Flutter Engine from be7db94196fe to 1fb20a297302 (10 revisions) flutter/flutter#150738

Closed

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

6884e83c1 Re-re-land "Upgrade all[most] androidx dependencies to late…

59e8455

…st" (flutter/engine#53532)

engine-flutter-autoroll mentioned this pull request Jun 24, 2024

Roll Flutter Engine from be7db94196fe to 63c240384b63 (11 revisions) flutter/flutter#150740

Closed

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

6884e83c1 Re-re-land "Upgrade all[most] androidx dependencies to late…

0dcc541

…st" (flutter/engine#53532)

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

Manual engine roll to 6884e83 (#150733)

ca116ee

Manual engine roll to flutter/engine#53532, because the roll requires lockfile generation.

gmackall mentioned this pull request Jun 25, 2024

Update androidx window dependency to 1.1 flutter/flutter#129307

Closed

gmackall added the revert Label used to revert changes in a closed and merged pull request. label Jun 25, 2024

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

Reverts "Manual engine roll to 6884e83 (#150733)" flutter/flutter#150746

Merged

9 tasks

auto-submit bot pushed a commit that referenced this pull request Jun 25, 2024

Revert "Re-re-land "Upgrade all[most] androidx dependencies to latest" (

3e65220

#53532)" This reverts commit 6884e83.

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

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

engine-flutter-autoroll mentioned this pull request Jun 25, 2024

Roll Flutter Engine from be7db94196fe to 6991653cbe27 (13 revisions) flutter/flutter#150747

Closed

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

6884e83c1 Re-re-land "Upgrade all[most] androidx dependencies to late…

91ed36c

…st" (flutter/engine#53532)

engine-flutter-autoroll mentioned this pull request Jun 25, 2024

Roll Flutter Engine from be7db94196fe to 77462b536202 (15 revisions) flutter/flutter#150752

Closed

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

6884e83c1 Re-re-land "Upgrade all[most] androidx dependencies to late…

9e820dd

…st" (flutter/engine#53532)

engine-flutter-autoroll mentioned this pull request Jun 25, 2024

Roll Flutter Engine from be7db94196fe to f39b5ab11594 (16 revisions) flutter/flutter#150753

Closed

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

6884e83c1 Re-re-land "Upgrade all[most] androidx dependencies to late…

b1700de

…st" (flutter/engine#53532)

engine-flutter-autoroll mentioned this pull request Jun 25, 2024

Roll Flutter Engine from be7db94196fe to 4bb4c1c2b5a6 (17 revisions) flutter/flutter#150756

Closed

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

6884e83c1 Re-re-land "Upgrade all[most] androidx dependencies to late…

645dcc5

…st" (flutter/engine#53532)

engine-flutter-autoroll mentioned this pull request Jun 25, 2024

Roll Flutter Engine from be7db94196fe to afa7ce19bca8 (18 revisions) flutter/flutter#150762

Merged

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

6884e83c1 Re-re-land "Upgrade all[most] androidx dependencies to late…

905f957

…st" (flutter/engine#53532)

sigurdm pushed a commit to sigurdm/flutter that referenced this pull request Jun 26, 2024

Manual engine roll to 6884e83 (flutter#150733)

d195496

Manual engine roll to flutter/engine#53532, because the roll requires lockfile generation.

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

Revert "Reverts "Re-re-land "Upgrade all[most] androidx dependencies …

f41b13f

…to latest" (flutter#53532)" (flutter#53546)" This reverts commit a07ba90.

gmackall mentioned this pull request Jun 27, 2024

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

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

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

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

Uh oh!

gmackall commented Jun 24, 2024 •

edited

Loading

Uh oh!

reidbaker Jun 24, 2024

Uh oh!

gmackall Jun 24, 2024

Uh oh!

Uh oh!

gmackall commented Jun 25, 2024

Uh oh!

Uh oh!

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

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

Uh oh!

Conversation

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

Uh oh!

Pre-launch Checklist

Uh oh!

reidbaker Jun 24, 2024

Choose a reason for hiding this comment

Uh oh!

gmackall Jun 24, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

gmackall commented Jun 25, 2024

Uh oh!

Uh oh!

gmackall commented Jun 24, 2024 •

edited

Loading