[Reland] Add migrator to upgrade gradle version when conflict with Android Studio bundled Java version is detected #125836

gmackall · 2023-05-01T21:00:12Z

This is an attempt to reland #124085.

Differences from this attempt and the last:

Adds a check for null android studio versions and a test for this case.
Wraps the migrate code in a try-catch per the suggestion here.

Old PR description:
This PR adds an android project migrator that checks the version of android studio and the version of gradle for conflicts, and upgrades to 7.4 if a conflict is detected. For more detail about the particular conflict, see #122376.

The PR also upgrades older gradle versions being used in integration testing to 7.4.

Fixes/related to: #122376 and #123636

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, including Features we expect every widget to implement.
I signed the CLA.
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is test-exempt.
All existing and new tests are passing.

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

…with And… (flutter#125813)" This reverts commit db7196c.

…ode in a try catch

packages/flutter_tools/test/general.shard/android/android_project_migration_test.dart

reidbaker · 2023-05-01T22:49:40Z

packages/flutter_tools/test/general.shard/android/android_project_migration_test.dart

+        migration.migrate();
+        expect(gradleWrapperPropertiesFile.readAsStringSync(), gradleWrapperToMigrateTo);
+        expect(bufferLogger.statusText, contains('Conflict detected between Android Studio Java version and Gradle version, '
+            'upgrading Gradle version from 6.7 to 7.6.1.'));


Consider using the constants defined here so if they upgrader uses a different version this test passes.

I've changed to use the constant defined for version we upgrade to, 7.6.1 (the other version, 6.7, is parsed in the migration method itself so it can't be used here).

reidbaker · 2023-05-02T14:45:20Z

.../flutter_tools/lib/src/android/migrations/android_studio_java_gradle_conflict_migration.dart

@@ -20,7 +20,7 @@ import '../gradle_utils.dart';
 @visibleForTesting
 final Version androidStudioFlamingo = Version(2022, 2, 0);

-const String _gradleVersion7_6_1 = r'7.6.1';
+const String gradleVersion7_6_1 = r'7.6.1';


I think this should be annotated @VisibleForTesting

This reverts commit 8120c9c.

dev/integration_tests/flutter_gallery/perf.json

gmackall · 2023-05-02T22:01:21Z

Removing autosubmit briefly to test an assumption about RegExp group counts.

gmackall · 2023-05-02T22:48:50Z

Since last approval, I wrapped two different values returned by RegExpMatch group().

The main reason is that it is possible in a case like

final RegExp r = RegExp(r'ab(c)?');
final String s = 'ab';
final RegExpMatch m = r.firstMatch(s);

for m.groupCount to be 1, but m[1] to be null. It isn't possible with the RegExp as written, but given that the regex is in a different file it would be good for this check to be resilient to changes.

…ct with Android Studio bundled Java version is detected (flutter/flutter#125836)

…droid Studio bundled Java version is detected (flutter#125836) This is an attempt to reland flutter#124085. Differences from this attempt and the last: 1. Adds a check for null android studio versions and a test for this case. 2. Wraps the migrate code in a try-catch [per the suggestion here](https://github.com/flutter/flutter/pull/125728/files#r1181747899). Old PR description: This PR adds an android project migrator that checks the version of android studio and the version of gradle for conflicts, and upgrades to 7.4 if a conflict is detected. For more detail about the particular conflict, see flutter#122376. The PR also upgrades older gradle versions being used in integration testing to 7.4. Fixes/related to: flutter#122376 and flutter#123636

…ct with Android Studio bundled Java version is detected (flutter/flutter#125836)

…droid Studio bundled Java version is detected (flutter#125836) This is an attempt to reland flutter#124085. Differences from this attempt and the last: 1. Adds a check for null android studio versions and a test for this case. 2. Wraps the migrate code in a try-catch [per the suggestion here](https://github.com/flutter/flutter/pull/125728/files#r1181747899). Old PR description: This PR adds an android project migrator that checks the version of android studio and the version of gradle for conflicts, and upgrades to 7.4 if a conflict is detected. For more detail about the particular conflict, see flutter#122376. The PR also upgrades older gradle versions being used in integration testing to 7.4. Fixes/related to: flutter#122376 and flutter#123636

…d Studio bundled Java version is detected (and 3 others) (#126093) This is a cherry pick of the following four PRs (the first one depends on changes made in the latter three). 1. #125836 2. #124771 3. #123034 4. #123644 For the first PR, Original issue: #122376 Cherry-pick issue: #125693 *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].* ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord].  [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [Features we expect every widget to implement]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat --------- Co-authored-by: Reid Baker <reidbaker@google.com> Co-authored-by: Mitchell Goodwin <58190796+MitchellGoodwin@users.noreply.github.com> Co-authored-by: Greg Spencer <gspencergoog@users.noreply.github.com> Co-authored-by: Victoria Ashworth <vashworth@google.com> Co-authored-by: Jackson Gardner <jacksongardner@google.com> Co-authored-by: Rydmike <m.rydstrom@gmail.com> Co-authored-by: keyonghan <54558023+keyonghan@users.noreply.github.com> Co-authored-by: chunhtai <47866232+chunhtai@users.noreply.github.com> Co-authored-by: Taha Tesser <tessertaha@gmail.com> Co-authored-by: Ben Konyi <bkonyi@google.com> Co-authored-by: engine-flutter-autoroll <engine-flutter-autoroll@skia.org> Co-authored-by: hellohuanlin <41930132+hellohuanlin@users.noreply.github.com> Co-authored-by: Danny Tuppeny <danny@tuppeny.com> Co-authored-by: Chris Bracken <chris@bracken.jp> Co-authored-by: Kate Lovett <katelovett@google.com> Co-authored-by: Michael Goderbauer <goderbauer@google.com> Co-authored-by: Elias Yishak <42216813+eliasyishak@users.noreply.github.com> Co-authored-by: Christopher Fujino <fujino@google.com> Co-authored-by: Andrew Kolos <andrewrkolos@gmail.com>

…ct with Android Studio bundled Java version is detected (flutter/flutter#125836)

…d Studio bundled Java version is detected (and 3 others) (flutter#126093) This is a cherry pick of the following four PRs (the first one depends on changes made in the latter three). 1. flutter#125836 2. flutter#124771 3. flutter#123034 4. flutter#123644 For the first PR, Original issue: flutter#122376 Cherry-pick issue: flutter#125693 *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].* - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord].  [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [Features we expect every widget to implement]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/wiki/Chat --------- Co-authored-by: Reid Baker <reidbaker@google.com> Co-authored-by: Mitchell Goodwin <58190796+MitchellGoodwin@users.noreply.github.com> Co-authored-by: Greg Spencer <gspencergoog@users.noreply.github.com> Co-authored-by: Victoria Ashworth <vashworth@google.com> Co-authored-by: Jackson Gardner <jacksongardner@google.com> Co-authored-by: Rydmike <m.rydstrom@gmail.com> Co-authored-by: keyonghan <54558023+keyonghan@users.noreply.github.com> Co-authored-by: chunhtai <47866232+chunhtai@users.noreply.github.com> Co-authored-by: Taha Tesser <tessertaha@gmail.com> Co-authored-by: Ben Konyi <bkonyi@google.com> Co-authored-by: engine-flutter-autoroll <engine-flutter-autoroll@skia.org> Co-authored-by: hellohuanlin <41930132+hellohuanlin@users.noreply.github.com> Co-authored-by: Danny Tuppeny <danny@tuppeny.com> Co-authored-by: Chris Bracken <chris@bracken.jp> Co-authored-by: Kate Lovett <katelovett@google.com> Co-authored-by: Michael Goderbauer <goderbauer@google.com> Co-authored-by: Elias Yishak <42216813+eliasyishak@users.noreply.github.com> Co-authored-by: Christopher Fujino <fujino@google.com> Co-authored-by: Andrew Kolos <andrewrkolos@gmail.com>

Gray Mackall added 2 commits May 1, 2023 13:40

Revert "Revert "Add migrator to upgrade gradle version when conflict …

2c2951a

…with And… (flutter#125813)" This reverts commit db7196c.

adding a check for null android studio version and wrapping migrate c…

c13f369

…ode in a try catch

gmackall requested review from gnprice, reidbaker and camsim99 May 1, 2023 21:00

reidbaker approved these changes May 1, 2023

View reviewed changes

Gray Mackall added 3 commits May 1, 2023 16:07

changing test to use target upgrade version constant

62ca35d

adding a test to cover catch block

f1a1394

changing FakeErroring test class to fix analyze warnings

190dd6f

reidbaker approved these changes May 2, 2023

View reviewed changes

reidbaker mentioned this pull request May 2, 2023

[CP] Cherry pick migrator to upgrade Gradle version when conflict with Android Studio bundled java is detected #125693

Closed

Gray Mackall added 4 commits May 2, 2023 10:07

making gradle version constant @VisibleForTesting

b9956ad

adding last missed integration test

8120c9c

Revert "adding last missed integration test"

03d21ae

This reverts commit 8120c9c.

adding missed integration test gradle wrapper

af0a939

reidbaker reviewed May 2, 2023

View reviewed changes

dev/integration_tests/flutter_gallery/perf.json Outdated Show resolved Hide resolved

reidbaker approved these changes May 2, 2023

View reviewed changes

gmackall 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 May 2, 2023

Gray Mackall added 2 commits May 2, 2023 15:38

adding a check for null group even when groupcount is 1

5e0a402

one more null check on regex groups

32e2601

gmackall mentioned this pull request May 3, 2023

Google Testing did not update PR status despite tests passing #125994

Closed

engine-flutter-autoroll mentioned this pull request May 4, 2023

Roll Flutter from db6074ade4e4 to ce32282c0c6e (47 revisions) flutter/packages#3904

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 4, 2023

c12488a70 [Reland] Add migrator to upgrade gradle version when confli…

4ed39ec

…ct with Android Studio bundled Java version is detected (flutter/flutter#125836)

engine-flutter-autoroll mentioned this pull request May 4, 2023

Roll Flutter from db6074ade4e4 to c2022aa5b140 (48 revisions) flutter/packages#3905

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 4, 2023

c12488a70 [Reland] Add migrator to upgrade gradle version when confli…

16072a6

…ct with Android Studio bundled Java version is detected (flutter/flutter#125836)

engine-flutter-autoroll mentioned this pull request May 4, 2023

Roll Flutter from db6074ade4e4 to 8ec5001ac261 (49 revisions) flutter/packages#3906

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 4, 2023

c12488a70 [Reland] Add migrator to upgrade gradle version when confli…

72157c6

…ct with Android Studio bundled Java version is detected (flutter/flutter#125836)

gmackall mentioned this pull request May 4, 2023

[CP] Add migrator to upgrade gradle version when conflict with Android Studio bundled Java version is detected (and 2 others) #126081

Closed

8 tasks

engine-flutter-autoroll mentioned this pull request May 4, 2023

Roll Flutter from db6074ade4e4 to fde717da53ec (50 revisions) flutter/packages#3907

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 4, 2023

c12488a70 [Reland] Add migrator to upgrade gradle version when confli…

b09a1f6

…ct with Android Studio bundled Java version is detected (flutter/flutter#125836)

gmackall mentioned this pull request May 4, 2023

[CP] Add migrator to upgrade gradle version when conflict with Android Studio bundled Java version is detected (and 3 others) #126093

Merged

8 tasks

engine-flutter-autoroll mentioned this pull request May 4, 2023

Manual roll Flutter from db6074ade4e4 to 0b657236cae4 (54 revisions) flutter/packages#3908

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 4, 2023

c12488a70 [Reland] Add migrator to upgrade gradle version when confli…

450ee84

…ct with Android Studio bundled Java version is detected (flutter/flutter#125836)

gnprice mentioned this pull request Jun 19, 2023

[tool_crash] _TypeError: (#0 AndroidStudioJavaGradleConflictMigration.migrate (package:flutter_tools/src/android/migrations/android_studio_java_gradle_conflict_migration.dart:107:39)) #125712

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 16, 2023

c12488a70 [Reland] Add migrator to upgrade gradle version when confli…

4b0be33

…ct with Android Studio bundled Java version is detected (flutter/flutter#125836)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023

c12488a70 [Reland] Add migrator to upgrade gradle version when confli…

04dd1cf

…ct with Android Studio bundled Java version is detected (flutter/flutter#125836)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023

c12488a70 [Reland] Add migrator to upgrade gradle version when confli…

29ebab6

…ct with Android Studio bundled Java version is detected (flutter/flutter#125836)

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023

c12488a70 [Reland] Add migrator to upgrade gradle version when confli…

8ad3542

…ct with Android Studio bundled Java version is detected (flutter/flutter#125836)

gmackall mentioned this pull request Oct 26, 2023

Create a migrator to upgrade KGP versions less than 1.8.10 #137352

Open

gmackall deleted the reland_gradle_migrator branch January 17, 2024 04:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Reland] Add migrator to upgrade gradle version when conflict with Android Studio bundled Java version is detected #125836

[Reland] Add migrator to upgrade gradle version when conflict with Android Studio bundled Java version is detected #125836

gmackall commented May 1, 2023 •

edited

reidbaker May 1, 2023

gmackall May 1, 2023 •

edited

reidbaker May 2, 2023

gmackall commented May 2, 2023

gmackall commented May 2, 2023 •

edited

[Reland] Add migrator to upgrade gradle version when conflict with Android Studio bundled Java version is detected #125836

[Reland] Add migrator to upgrade gradle version when conflict with Android Studio bundled Java version is detected #125836

Conversation

gmackall commented May 1, 2023 • edited

Pre-launch Checklist

reidbaker May 1, 2023

Choose a reason for hiding this comment

gmackall May 1, 2023 • edited

Choose a reason for hiding this comment

reidbaker May 2, 2023

Choose a reason for hiding this comment

gmackall commented May 2, 2023

gmackall commented May 2, 2023 • edited

gmackall commented May 1, 2023 •

edited

gmackall May 1, 2023 •

edited

gmackall commented May 2, 2023 •

edited