Skip to content

Conversation

@gmackall
Copy link
Member

@gmackall gmackall commented Apr 3, 2024

Bump almost all tests to AGP 8.1 and Gradle 8.3

Flutter gallery is excluded, because it uses discontinued plugins that in turn use old Gradle versions, and that prevents upgrading. Will take some extra work to figure out what to do there.

Should bump templates next

Entire PR generated with the lockfile generation script, except for:

  1. changes within dev/integration_tests/gradle_deprecated_settings/android/, which must be done manually (and exclusion of the gallery for reason mentioned above).
  2. Changes to many AndroidManifest.xml files to remove the package attribute and instead set that same value in the build.gradle, in the namespace attribute of the android closure (corresponds to an AGP behavior change, see https://d.android.com/r/tools/upgrade-assistant/set-namespace).
  3. Removes the use of the battery plugin in android_embedding_v2_smoke_test because the plugin is discontinued, unused, and blocks upgrading the AGP version for that app because the discontinued plugin itself uses a very old AGP version.

Pre-launch Checklist

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

… a pubspec (should I get rid of pubspec change??))
@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 3, 2024
@gmackall gmackall marked this pull request as ready for review April 3, 2024 18:35
@gmackall gmackall marked this pull request as draft April 3, 2024 18:54
@github-actions github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Apr 3, 2024
@gmackall gmackall marked this pull request as ready for review April 3, 2024 22:04
Copy link
Contributor

@christopherfujino christopherfujino left a comment

Choose a reason for hiding this comment

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

tool change lgtm

@gmackall gmackall requested a review from a team April 3, 2024 22:16
Copy link
Contributor

Choose a reason for hiding this comment

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

I didnt think the script modified namespace. Here and in dev/integration_tests/abstract_method_smoke_test/android/app/src/main/AndroidManifest.xml

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah sorry yes - I had to manually make the "Android manifest package attribute -> AGP namespace attribute" move in a couple of places as well.

Copy link
Contributor

Choose a reason for hiding this comment

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

same here and dev/integration_tests/android_embedding_v2_smoke_test/android/app/src/main/AndroidManifest.xml

flutter:
sdk: flutter
# This plugin is using Android Embedding 1
battery: 2.0.3
Copy link
Contributor

Choose a reason for hiding this comment

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

Should this instead be replaced with https://pub.dev/packages/battery_plus

Also was this change done by the script?

Copy link
Member Author

@gmackall gmackall Apr 4, 2024

Choose a reason for hiding this comment

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

Sorry this change was also not done by the script (I don't know how I forgot both of these). This plugin was also discontinued (and therefore also had a low AGP version, thus blocking the upgrade), so I just tried removing it. It doesn't look like it is actually used.

I think the purpose of including it was just to make sure a v2 embedding app could use a v1 embedding plugin, but that doesn't matter anymore because I've removed the logic it would be testing.

@gmackall gmackall requested a review from reidbaker April 4, 2024 19:11
@gmackall gmackall added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 4, 2024
@auto-submit auto-submit bot merged commit ab520c9 into flutter:master Apr 4, 2024
@LongCatIsLooong
Copy link
Contributor

@LongCatIsLooong LongCatIsLooong added the revert Autorevert PR (with "Reason for revert:" comment) label Apr 4, 2024
auto-submit bot pushed a commit that referenced this pull request Apr 4, 2024
@auto-submit auto-submit bot removed the revert Autorevert PR (with "Reason for revert:" comment) label Apr 4, 2024
auto-submit bot added a commit that referenced this pull request Apr 4, 2024
…146305)

Reverts: #146181
Initiated by: LongCatIsLooong
Reason for reverting: https://ci.chromium.org/ui/p/flutter/builders/prod/Windows_android%20flavors_test_win/11086/overview
Original PR Author: gmackall

Reviewed By: {reidbaker, christopherfujino}

This change reverts the following previous change:
Bump almost all tests to AGP 8.1 and Gradle 8.3

Flutter gallery is excluded, because it uses discontinued plugins that in turn use old Gradle versions, and that prevents upgrading. Will take some extra work to figure out what to do there.

Should bump templates next

Entire PR generated with the lockfile generation script, except for:
1. changes within `dev/integration_tests/gradle_deprecated_settings/android/`, which must be done manually (and exclusion of the gallery for reason mentioned above).
2. Changes to many `AndroidManifest.xml` files to remove the `package` attribute and instead set that same value in the `build.gradle`, in the `namespace` attribute of the `android` closure (corresponds to an AGP behavior change, see  https://d.android.com/r/tools/upgrade-assistant/set-namespace).
3. Removes the use of the `battery` plugin in `android_embedding_v2_smoke_test` because the plugin is discontinued, unused, and blocks upgrading the AGP version for that app because the discontinued plugin itself uses a very old AGP version.
@gmackall
Copy link
Member Author

gmackall commented Apr 4, 2024

Copying discord comment here for visibility:

Looks like we have one (postsubmit) test
https://github.com/search?q=repo%3Aflutter%2Fflutter+BuildConfig+language%3AJava&type=code&l=Java
that uses the generated BuildConfig class, which is only generated when the buildFeatures.buildConfig flag is set to true, and that flag defaulted to true in AGP 7.x but defaults to false in AGP 8.x. I'll put up a re-land that explicitly sets the flag to true (we had to do a similar thing in the packages repo a couple times)

gmackall pushed a commit to gmackall/flutter that referenced this pull request Apr 4, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 5, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 5, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 5, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 5, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 5, 2024
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Apr 5, 2024
Roll Flutter from ac2ca93 to 477ebd8 (32 revisions)

flutter/flutter@ac2ca93...477ebd8

2024-04-05 [email protected] Roll Flutter Engine from 95ffe73ac2a8 to 6974dbac35a1 (2 revisions) (flutter/flutter#146350)
2024-04-05 [email protected] Roll pub packages (flutter/flutter#146348)
2024-04-05 [email protected] Roll Packages from dce6f0c to 764d997 (4 revisions) (flutter/flutter#146344)
2024-04-05 [email protected] Roll Flutter Engine from 292c48b9af5e to 95ffe73ac2a8 (1 revision) (flutter/flutter#146343)
2024-04-05 [email protected] Roll pub packages (flutter/flutter#146331)
2024-04-05 [email protected] Roll Flutter Engine from 23a1d0d2fce6 to 292c48b9af5e (1 revision) (flutter/flutter#146330)
2024-04-05 [email protected] Roll Flutter Engine from 597d33f57183 to 23a1d0d2fce6 (1 revision) (flutter/flutter#146327)
2024-04-05 [email protected] Roll Flutter Engine from 1fa0623bb07f to 597d33f57183 (1 revision) (flutter/flutter#146325)
2024-04-05 [email protected] Roll Flutter Engine from f17d586de6f1 to 1fa0623bb07f (1 revision) (flutter/flutter#146324)
2024-04-05 [email protected] Roll Flutter Engine from d44462a42d73 to f17d586de6f1 (4 revisions) (flutter/flutter#146322)
2024-04-05 [email protected] Fix cursor is not centered when cursorHeight is set (non-Apple platforms). (flutter/flutter#145829)
2024-04-05 [email protected] refactor: Perform plugin resolution per platform (flutter/flutter#144506)
2024-04-04 [email protected] `ExpansionTile` Unable to remove right padding from title (flutter/flutter#145271)
2024-04-04 [email protected] Roll Flutter Engine from dcc99d652154 to d44462a42d73 (1 revision) (flutter/flutter#146311)
2024-04-04 49699333+dependabot[bot]@users.noreply.github.com Bump codecov/codecov-action from 4.1.1 to 4.2.0 (flutter/flutter#146310)
2024-04-04 [email protected] Roll Flutter Engine from e3104af94328 to dcc99d652154 (4 revisions) (flutter/flutter#146308)
2024-04-04 [email protected] Roll Flutter Engine from fa4d97e363ff to e3104af94328 (2 revisions) (flutter/flutter#146300)
2024-04-04 [email protected] Remove dead `compareIosVersions` function (flutter/flutter#146298)
2024-04-04 [email protected] Adds semanticsLabel to MenuItemButton (flutter/flutter#145846)
2024-04-04 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Bump to AGP 8.1/Gradle 8.3 (almost) everywhere (#146181)" (flutter/flutter#146305)
2024-04-04 [email protected] Roll Flutter Engine from 918c72b803cc to fa4d97e363ff (2 revisions) (flutter/flutter#146299)
2024-04-04 [email protected] Bump to AGP 8.1/Gradle 8.3 (almost) everywhere (flutter/flutter#146181)
2024-04-04 [email protected] Roll Flutter Engine from 03cd54d4285a to 918c72b803cc (2 revisions) (flutter/flutter#146296)
2024-04-04 [email protected] Fix InputDecorator suffix and prefix IconButtons ignore `IconButtonTheme` (flutter/flutter#145473)
2024-04-04 [email protected] Give `generate_gradle_lockfiles.dart` functionality to exclude certain subdirectories (flutter/flutter#146228)
2024-04-04 [email protected] Update documentation to discourage using the TextEditingController.text setter (flutter/flutter#146151)
2024-04-04 [email protected] Roll Flutter Engine from b2ceabf7acce to 03cd54d4285a (1 revision) (flutter/flutter#146292)
2024-04-04 [email protected] Roll Flutter Engine from b435a8a87df0 to b2ceabf7acce (1 revision) (flutter/flutter#146283)
2024-04-04 [email protected] Roll Flutter Engine from bd51ee80d74b to b435a8a87df0 (1 revision) (flutter/flutter#146279)
2024-04-04 [email protected] Roll Packages from 0e848fa to dce6f0c (4 revisions) (flutter/flutter#146276)
2024-04-04 [email protected] Flutter templates example app Gradle memory settings (flutter/flutter#146275)
2024-04-04 [email protected] Roll Flutter Engine from 4303dc0d7a73 to bd51ee80d74b (2 revisions) (flutter/flutter#146273)

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 Apr 5, 2024
Relands #146181.

Just 3 commits:
1. a revert of the revert
2. the fix described in #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).
gilnobrega pushed a commit to gilnobrega/flutter that referenced this pull request Apr 22, 2024
Bump almost all tests to AGP 8.1 and Gradle 8.3

Flutter gallery is excluded, because it uses discontinued plugins that in turn use old Gradle versions, and that prevents upgrading. Will take some extra work to figure out what to do there.

Should bump templates next

Entire PR generated with the lockfile generation script, except for:
1. changes within `dev/integration_tests/gradle_deprecated_settings/android/`, which must be done manually (and exclusion of the gallery for reason mentioned above).
2. Changes to many `AndroidManifest.xml` files to remove the `package` attribute and instead set that same value in the `build.gradle`, in the `namespace` attribute of the `android` closure (corresponds to an AGP behavior change, see  https://d.android.com/r/tools/upgrade-assistant/set-namespace).
3. Removes the use of the `battery` plugin in `android_embedding_v2_smoke_test` because the plugin is discontinued, unused, and blocks upgrading the AGP version for that app because the discontinued plugin itself uses a very old AGP version.
gilnobrega pushed a commit to gilnobrega/flutter that referenced this pull request Apr 22, 2024
…)" (flutter#146305)

Reverts: flutter#146181
Initiated by: LongCatIsLooong
Reason for reverting: https://ci.chromium.org/ui/p/flutter/builders/prod/Windows_android%20flavors_test_win/11086/overview
Original PR Author: gmackall

Reviewed By: {reidbaker, christopherfujino}

This change reverts the following previous change:
Bump almost all tests to AGP 8.1 and Gradle 8.3

Flutter gallery is excluded, because it uses discontinued plugins that in turn use old Gradle versions, and that prevents upgrading. Will take some extra work to figure out what to do there.

Should bump templates next

Entire PR generated with the lockfile generation script, except for:
1. changes within `dev/integration_tests/gradle_deprecated_settings/android/`, which must be done manually (and exclusion of the gallery for reason mentioned above).
2. Changes to many `AndroidManifest.xml` files to remove the `package` attribute and instead set that same value in the `build.gradle`, in the `namespace` attribute of the `android` closure (corresponds to an AGP behavior change, see  https://d.android.com/r/tools/upgrade-assistant/set-namespace).
3. Removes the use of the `battery` plugin in `android_embedding_v2_smoke_test` because the plugin is discontinued, unused, and blocks upgrading the AGP version for that app because the discontinued plugin itself uses a very old AGP version.
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
Roll Flutter from ac2ca93 to 477ebd8 (32 revisions)

flutter/flutter@ac2ca93...477ebd8

2024-04-05 [email protected] Roll Flutter Engine from 95ffe73ac2a8 to 6974dbac35a1 (2 revisions) (flutter/flutter#146350)
2024-04-05 [email protected] Roll pub packages (flutter/flutter#146348)
2024-04-05 [email protected] Roll Packages from dce6f0c to 764d997 (4 revisions) (flutter/flutter#146344)
2024-04-05 [email protected] Roll Flutter Engine from 292c48b9af5e to 95ffe73ac2a8 (1 revision) (flutter/flutter#146343)
2024-04-05 [email protected] Roll pub packages (flutter/flutter#146331)
2024-04-05 [email protected] Roll Flutter Engine from 23a1d0d2fce6 to 292c48b9af5e (1 revision) (flutter/flutter#146330)
2024-04-05 [email protected] Roll Flutter Engine from 597d33f57183 to 23a1d0d2fce6 (1 revision) (flutter/flutter#146327)
2024-04-05 [email protected] Roll Flutter Engine from 1fa0623bb07f to 597d33f57183 (1 revision) (flutter/flutter#146325)
2024-04-05 [email protected] Roll Flutter Engine from f17d586de6f1 to 1fa0623bb07f (1 revision) (flutter/flutter#146324)
2024-04-05 [email protected] Roll Flutter Engine from d44462a42d73 to f17d586de6f1 (4 revisions) (flutter/flutter#146322)
2024-04-05 [email protected] Fix cursor is not centered when cursorHeight is set (non-Apple platforms). (flutter/flutter#145829)
2024-04-05 [email protected] refactor: Perform plugin resolution per platform (flutter/flutter#144506)
2024-04-04 [email protected] `ExpansionTile` Unable to remove right padding from title (flutter/flutter#145271)
2024-04-04 [email protected] Roll Flutter Engine from dcc99d652154 to d44462a42d73 (1 revision) (flutter/flutter#146311)
2024-04-04 49699333+dependabot[bot]@users.noreply.github.com Bump codecov/codecov-action from 4.1.1 to 4.2.0 (flutter/flutter#146310)
2024-04-04 [email protected] Roll Flutter Engine from e3104af94328 to dcc99d652154 (4 revisions) (flutter/flutter#146308)
2024-04-04 [email protected] Roll Flutter Engine from fa4d97e363ff to e3104af94328 (2 revisions) (flutter/flutter#146300)
2024-04-04 [email protected] Remove dead `compareIosVersions` function (flutter/flutter#146298)
2024-04-04 [email protected] Adds semanticsLabel to MenuItemButton (flutter/flutter#145846)
2024-04-04 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Bump to AGP 8.1/Gradle 8.3 (almost) everywhere (#146181)" (flutter/flutter#146305)
2024-04-04 [email protected] Roll Flutter Engine from 918c72b803cc to fa4d97e363ff (2 revisions) (flutter/flutter#146299)
2024-04-04 [email protected] Bump to AGP 8.1/Gradle 8.3 (almost) everywhere (flutter/flutter#146181)
2024-04-04 [email protected] Roll Flutter Engine from 03cd54d4285a to 918c72b803cc (2 revisions) (flutter/flutter#146296)
2024-04-04 [email protected] Fix InputDecorator suffix and prefix IconButtons ignore `IconButtonTheme` (flutter/flutter#145473)
2024-04-04 [email protected] Give `generate_gradle_lockfiles.dart` functionality to exclude certain subdirectories (flutter/flutter#146228)
2024-04-04 [email protected] Update documentation to discourage using the TextEditingController.text setter (flutter/flutter#146151)
2024-04-04 [email protected] Roll Flutter Engine from b2ceabf7acce to 03cd54d4285a (1 revision) (flutter/flutter#146292)
2024-04-04 [email protected] Roll Flutter Engine from b435a8a87df0 to b2ceabf7acce (1 revision) (flutter/flutter#146283)
2024-04-04 [email protected] Roll Flutter Engine from bd51ee80d74b to b435a8a87df0 (1 revision) (flutter/flutter#146279)
2024-04-04 [email protected] Roll Packages from 0e848fa to dce6f0c (4 revisions) (flutter/flutter#146276)
2024-04-04 [email protected] Flutter templates example app Gradle memory settings (flutter/flutter#146275)
2024-04-04 [email protected] Roll Flutter Engine from 4303dc0d7a73 to bd51ee80d74b (2 revisions) (flutter/flutter#146273)

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
...
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. tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants