Skip to content

Conversation

@gmackall
Copy link
Member

@gmackall gmackall commented Apr 4, 2024

Relands #146181.

Just 3 commits:

  1. a revert of the revert
  2. the fix described in Bump to AGP 8.1/Gradle 8.3 (almost) everywhere #146181 (comment)
  3. updating two postsubmit tests from Java 11 to 17, as that is required for this new AGP version.

I've verified that flutter build apk --flavor paid --debug fails in dev/integration_tests/flavors/ with the error in ci without (2), and succeeds with it.

I've also verified that the dev/benchmarks/complex_layout app builds successfully with Java 17.

That covers all the postsubmits that failed according to the dashboard.

Pre-launch Checklist

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

@github-actions github-actions bot added a: tests "flutter test", flutter_test, or one of our tests framework flutter/packages/flutter repository. See also f: labels. d: examples Sample code and demos f: integration_test The flutter/packages/integration_test plugin labels Apr 4, 2024
@gmackall gmackall changed the title Reland Reland "Bump to AGP 8.1/Gradle 8.3 (almost) everywhere" Apr 4, 2024
@gmackall gmackall marked this pull request as ready for review April 5, 2024 18:05
@gmackall gmackall requested a review from a team April 5, 2024 18:05
Copy link
Contributor

@camsim99 camsim99 left a comment

Choose a reason for hiding this comment

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

Woohoo!

@gmackall gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 5, 2024
@auto-submit auto-submit bot merged commit 22e0c89 into flutter:master Apr 5, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 6, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 6, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 7, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 7, 2024
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Apr 7, 2024
flutter/flutter@477ebd8...98d23f7

2024-04-06 [email protected] Prepare for RenderDecorator.computeBaseline changes. (flutter/flutter#146363)
2024-04-06 [email protected] Roll Flutter Engine from 563bdb1d7976 to 605b3f35fa0a (1 revision) (flutter/flutter#146393)
2024-04-06 [email protected] Roll Flutter Engine from 482172d16528 to 563bdb1d7976 (1 revision) (flutter/flutter#146385)
2024-04-06 [email protected] Roll Flutter Engine from b0d7ac5425e9 to 482172d16528 (1 revision) (flutter/flutter#146382)
2024-04-06 [email protected] Roll Flutter Engine from df9f7433fc70 to b0d7ac5425e9 (2 revisions) (flutter/flutter#146377)
2024-04-06 [email protected] Roll Flutter Engine from b5039157cbc1 to df9f7433fc70 (1 revision) (flutter/flutter#146373)
2024-04-05 [email protected] Make FileSystem dependency explicit througout. (flutter/flutter#146008)
2024-04-05 [email protected] Roll Flutter Engine from 48604dfd9d49 to b5039157cbc1 (3 revisions) (flutter/flutter#146370)
2024-04-05 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 3.24.9 to 3.24.10 (flutter/flutter#146368)
2024-04-05 [email protected] Roll Flutter Engine from da995a1061c5 to 48604dfd9d49 (2 revisions) (flutter/flutter#146366)
2024-04-05 [email protected] Roll Flutter Engine from 6a478d6931b2 to da995a1061c5 (1 revision) (flutter/flutter#146364)
2024-04-05 [email protected] Roll Flutter Engine from 62df3bd5f681 to 6a478d6931b2 (3 revisions) (flutter/flutter#146360)
2024-04-05 [email protected] Copy part files and sourcemaps when building with dart2js. (flutter/flutter#146356)
2024-04-05 [email protected] Roll Flutter Engine from d048b9aed529 to 62df3bd5f681 (1 revision) (flutter/flutter#146357)
2024-04-05 [email protected] Reland "Bump to AGP 8.1/Gradle 8.3 (almost) everywhere" (flutter/flutter#146307)
2024-04-05 [email protected] Roll Flutter Engine from 6974dbac35a1 to d048b9aed529 (1 revision) (flutter/flutter#146355)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
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 Packages: 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
gilnobrega pushed a commit to gilnobrega/flutter that referenced this pull request Apr 22, 2024
Relands flutter#146181.

Just 3 commits:
1. a revert of the revert
2. the fix described in flutter#146181 (comment)
3. updating two postsubmit tests from Java 11 to 17, as that is required for this new AGP version.

I've verified that `flutter build apk --flavor paid --debug` fails in `dev/integration_tests/flavors/` with the error in ci without (2), and succeeds with it. 

I've also verified that the `dev/benchmarks/complex_layout` app builds successfully with Java 17.

That covers all the postsubmits that failed according [to the dashboard](https://flutter-dashboard.appspot.com/#/build).
TecHaxter pushed a commit to TecHaxter/flutter_packages that referenced this pull request May 22, 2024
flutter/flutter@477ebd8...98d23f7

2024-04-06 [email protected] Prepare for RenderDecorator.computeBaseline changes. (flutter/flutter#146363)
2024-04-06 [email protected] Roll Flutter Engine from 563bdb1d7976 to 605b3f35fa0a (1 revision) (flutter/flutter#146393)
2024-04-06 [email protected] Roll Flutter Engine from 482172d16528 to 563bdb1d7976 (1 revision) (flutter/flutter#146385)
2024-04-06 [email protected] Roll Flutter Engine from b0d7ac5425e9 to 482172d16528 (1 revision) (flutter/flutter#146382)
2024-04-06 [email protected] Roll Flutter Engine from df9f7433fc70 to b0d7ac5425e9 (2 revisions) (flutter/flutter#146377)
2024-04-06 [email protected] Roll Flutter Engine from b5039157cbc1 to df9f7433fc70 (1 revision) (flutter/flutter#146373)
2024-04-05 [email protected] Make FileSystem dependency explicit througout. (flutter/flutter#146008)
2024-04-05 [email protected] Roll Flutter Engine from 48604dfd9d49 to b5039157cbc1 (3 revisions) (flutter/flutter#146370)
2024-04-05 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 3.24.9 to 3.24.10 (flutter/flutter#146368)
2024-04-05 [email protected] Roll Flutter Engine from da995a1061c5 to 48604dfd9d49 (2 revisions) (flutter/flutter#146366)
2024-04-05 [email protected] Roll Flutter Engine from 6a478d6931b2 to da995a1061c5 (1 revision) (flutter/flutter#146364)
2024-04-05 [email protected] Roll Flutter Engine from 62df3bd5f681 to 6a478d6931b2 (3 revisions) (flutter/flutter#146360)
2024-04-05 [email protected] Copy part files and sourcemaps when building with dart2js. (flutter/flutter#146356)
2024-04-05 [email protected] Roll Flutter Engine from d048b9aed529 to 62df3bd5f681 (1 revision) (flutter/flutter#146357)
2024-04-05 [email protected] Reland "Bump to AGP 8.1/Gradle 8.3 (almost) everywhere" (flutter/flutter#146307)
2024-04-05 [email protected] Roll Flutter Engine from 6974dbac35a1 to d048b9aed529 (1 revision) (flutter/flutter#146355)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
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 Packages: 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
auto-submit bot pushed a commit that referenced this pull request Jul 1, 2024
…d tests (#150969)

After the land of flutter/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-submit bot added a commit 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/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/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/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
…d tests (flutter#150969)

After the land of flutter/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/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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

a: tests "flutter test", flutter_test, or one of our tests autosubmit Merge PR when tree becomes green via auto submit App d: examples Sample code and demos f: integration_test The flutter/packages/integration_test plugin framework flutter/packages/flutter repository. See also f: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants