Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

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

Merged
auto-submit[bot] merged 2 commits into
flutter-team-archive:mainfrom
gmackall:re_x4_land_androidx
Jun 27, 2024
Merged

Re-re-re-land "Upgrade all[most] androidx dependencies to latest"#53592
auto-submit[bot] merged 2 commits into
flutter-team-archive:mainfrom
gmackall:re_x4_land_androidx

Conversation

@gmackall

@gmackallgmackall commented Jun 26, 2024

Copy link
Copy Markdown
Contributor

Updating androidx dependencies unblocks ongoing android feature work such as scribe, fixes a memory leak in one of the sub libraries and generally has bug fixes across the board.

The cost is that these new libraries according to the androidx team required a minimum compile sdk version of 31 for any flutter app and all of its plugins.

Re-re-re-land #53001.

I recreated the postsubmit failures of the roll of the last land, 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.

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.

@gmackall
gmackall marked this pull request as ready for review June 27, 2024 18:56
@gmackall
gmackall requested review from a team and matanlureyJune 27, 2024 19:00

@matanlureymatanlurey left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RSLGTM!

@gmackallgmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Jun 27, 2024
@reidbaker

Copy link
Copy Markdown
Contributor

I think this pr description should be updated with what we know of the compile sdk requirements that come with this pr.

@gmackallgmackall added autosubmit Merge PR when tree becomes green via auto submit App and removed autosubmit Merge PR when tree becomes green via auto submit App labels Jun 27, 2024
@auto-submit
auto-submitBot merged commit ddd4814 into flutter-team-archive:mainJun 27, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jun 27, 2024
auto-submitBot pushed a commit to flutter/flutter that referenced this pull request Jun 27, 2024
Manual engine roll up to flutter-team-archive/engine#53592.
Manual roll because the change requires Gradle lockfiles to be re-generated.
auto-submitBot pushed a commit to flutter/flutter that referenced this pull request Jul 1, 2024
…d tests (#150969)
After the land of flutter-team-archive/engine#53592, there is some log spam:
```
e: /Users/mackall/.gradle/caches/transforms-3/c1e137371ec1afe9bc9bd7b05823752d/transformed/fragment-1.7.1/jars/classes.jar!/META-INF/fragment_release.kotlin_module: Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.8.0, expected version is 1.6.0.
e: /Users/mackall/.gradle/caches/transforms-3/d86c7cb1c556fe1655fa56db671c649c/transformed/jetified-activity-1.8.1/jars/classes.jar!/META-INF/activity_release.kotlin_module: Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.8.0, expected version is 1.6.0.
...
```
I think this is harmless, but still annoying. Upgrading the AGP version fixes it. To be honest, I don't know why (I expected the Kotlin version would do it). But after #146307, our tests have been running on AGP/Gradle 8.1/8.3 for a while, so it makes sense to upgrade anyways.
In a follow up PR:
1. Also upgrade the tests that were left behind in #146307, as I think removal of discontinued plugins paved the way here.
auto-submitBot added a commit to flutter/flutter that referenced this pull request Jul 1, 2024
…sions, and tests (#150969)" (#151147)
Reverts: #150969
Initiated by: goderbauer
Reason for reverting: Failing test in https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8743574743030691569/+/u/run_android_obfuscate_test/stdout
Original PR Author: gmackall
Reviewed By: {christopherfujino, reidbaker}
This change reverts the following previous change:
After the land of flutter-team-archive/engine#53592, there is some log spam:
```
e: /Users/mackall/.gradle/caches/transforms-3/c1e137371ec1afe9bc9bd7b05823752d/transformed/fragment-1.7.1/jars/classes.jar!/META-INF/fragment_release.kotlin_module: Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.8.0, expected version is 1.6.0.
e: /Users/mackall/.gradle/caches/transforms-3/d86c7cb1c556fe1655fa56db671c649c/transformed/jetified-activity-1.8.1/jars/classes.jar!/META-INF/activity_release.kotlin_module: Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.8.0, expected version is 1.6.0.
...
```
I think this is harmless, but still annoying. Upgrading the AGP version fixes it. To be honest, I don't know why (I expected the Kotlin version would do it). But after #146307, our tests have been running on AGP/Gradle 8.1/8.3 for a while, so it makes sense to upgrade anyways.
In a follow up PR:
1. Also upgrade the tests that were left behind in #146307, as I think removal of discontinued plugins paved the way here.
sigurdm pushed a commit to sigurdm/flutter that referenced this pull request Jul 2, 2024
…d tests (flutter#150969)
After the land of flutter-team-archive/engine#53592, there is some log spam:
```
e: /Users/mackall/.gradle/caches/transforms-3/c1e137371ec1afe9bc9bd7b05823752d/transformed/fragment-1.7.1/jars/classes.jar!/META-INF/fragment_release.kotlin_module: Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.8.0, expected version is 1.6.0.
e: /Users/mackall/.gradle/caches/transforms-3/d86c7cb1c556fe1655fa56db671c649c/transformed/jetified-activity-1.8.1/jars/classes.jar!/META-INF/activity_release.kotlin_module: Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.8.0, expected version is 1.6.0.
...
```
I think this is harmless, but still annoying. Upgrading the AGP version fixes it. To be honest, I don't know why (I expected the Kotlin version would do it). But after flutter#146307, our tests have been running on AGP/Gradle 8.1/8.3 for a while, so it makes sense to upgrade anyways.
In a follow up PR:
1. Also upgrade the tests that were left behind in flutter#146307, as I think removal of discontinued plugins paved the way here.
sigurdm pushed a commit to sigurdm/flutter that referenced this pull request Jul 2, 2024
…sions, and tests (flutter#150969)" (flutter#151147)
Reverts: flutter#150969
Initiated by: goderbauer
Reason for reverting: Failing test in https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8743574743030691569/+/u/run_android_obfuscate_test/stdout
Original PR Author: gmackall
Reviewed By: {christopherfujino, reidbaker}
This change reverts the following previous change:
After the land of flutter-team-archive/engine#53592, there is some log spam:
```
e: /Users/mackall/.gradle/caches/transforms-3/c1e137371ec1afe9bc9bd7b05823752d/transformed/fragment-1.7.1/jars/classes.jar!/META-INF/fragment_release.kotlin_module: Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.8.0, expected version is 1.6.0.
e: /Users/mackall/.gradle/caches/transforms-3/d86c7cb1c556fe1655fa56db671c649c/transformed/jetified-activity-1.8.1/jars/classes.jar!/META-INF/activity_release.kotlin_module: Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.8.0, expected version is 1.6.0.
...
```
I think this is harmless, but still annoying. Upgrading the AGP version fixes it. To be honest, I don't know why (I expected the Kotlin version would do it). But after flutter#146307, our tests have been running on AGP/Gradle 8.1/8.3 for a while, so it makes sense to upgrade anyways.
In a follow up PR:
1. Also upgrade the tests that were left behind in flutter#146307, as I think removal of discontinued plugins paved the way here.
victorsanni pushed a commit to victorsanni/flutter that referenced this pull request Jul 8, 2024
Manual engine roll up to flutter-team-archive/engine#53592.
Manual roll because the change requires Gradle lockfiles to be re-generated.
victorsanni pushed a commit to victorsanni/flutter that referenced this pull request Jul 8, 2024
…d tests (flutter#150969)
After the land of flutter-team-archive/engine#53592, there is some log spam:
```
e: /Users/mackall/.gradle/caches/transforms-3/c1e137371ec1afe9bc9bd7b05823752d/transformed/fragment-1.7.1/jars/classes.jar!/META-INF/fragment_release.kotlin_module: Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.8.0, expected version is 1.6.0.
e: /Users/mackall/.gradle/caches/transforms-3/d86c7cb1c556fe1655fa56db671c649c/transformed/jetified-activity-1.8.1/jars/classes.jar!/META-INF/activity_release.kotlin_module: Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.8.0, expected version is 1.6.0.
...
```
I think this is harmless, but still annoying. Upgrading the AGP version fixes it. To be honest, I don't know why (I expected the Kotlin version would do it). But after flutter#146307, our tests have been running on AGP/Gradle 8.1/8.3 for a while, so it makes sense to upgrade anyways.
In a follow up PR:
1. Also upgrade the tests that were left behind in flutter#146307, as I think removal of discontinued plugins paved the way here.
victorsanni pushed a commit to victorsanni/flutter that referenced this pull request Jul 8, 2024
…sions, and tests (flutter#150969)" (flutter#151147)
Reverts: flutter#150969
Initiated by: goderbauer
Reason for reverting: Failing test in https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8743574743030691569/+/u/run_android_obfuscate_test/stdout
Original PR Author: gmackall
Reviewed By: {christopherfujino, reidbaker}
This change reverts the following previous change:
After the land of flutter-team-archive/engine#53592, there is some log spam:
```
e: /Users/mackall/.gradle/caches/transforms-3/c1e137371ec1afe9bc9bd7b05823752d/transformed/fragment-1.7.1/jars/classes.jar!/META-INF/fragment_release.kotlin_module: Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.8.0, expected version is 1.6.0.
e: /Users/mackall/.gradle/caches/transforms-3/d86c7cb1c556fe1655fa56db671c649c/transformed/jetified-activity-1.8.1/jars/classes.jar!/META-INF/activity_release.kotlin_module: Module was compiled with an incompatible version of Kotlin. The binary version of its metadata is 1.8.0, expected version is 1.6.0.
...
```
I think this is harmless, but still annoying. Upgrading the AGP version fixes it. To be honest, I don't know why (I expected the Kotlin version would do it). But after flutter#146307, our tests have been running on AGP/Gradle 8.1/8.3 for a while, so it makes sense to upgrade anyways.
In a follow up PR:
1. Also upgrade the tests that were left behind in flutter#146307, as I think removal of discontinued plugins paved the way here.
auto-submitBot pushed a commit to flutter/packages that referenced this pull request Aug 21, 2024
~This dependency seems to no longer be necessary. I expected this would be because the the androidx upgrade that [landed recently](flutter-team-archive/engine#53592) fixed the problem ([see theory](#7036 (comment))), but it seems that the packages even build on stable successfully. Perhaps there have been updates to the underlying `androidx` libraries themselves that fix the conflict, and we updated the versions in plugins far enough? I'm unsure.~
Updated for 3.24 release.
In a sense, fixesflutter/flutter#125062
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

autosubmitMerge PR when tree becomes green via auto submit Appplatform-android

Development

Successfully merging this pull request may close these issues.

4 participants

@gmackall@reidbaker@matanlurey@mackall-work