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

packages/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';
 
 // String that can be placed in the gradle-wrapper.properties to opt out of this
 // migrator.
@@ -151,10 +151,10 @@ class AndroidStudioJavaGradleConflictMigration extends ProjectMigrator {
     final String existingVersionString = gradleDistributionUrl[1]!;
     if (gradleVersionsToUpgradeFrom.contains(existingVersionString)) {
       logger.printStatus('Conflict detected between Android Studio Java version and Gradle version, '
-          'upgrading Gradle version from $existingVersionString to $_gradleVersion7_6_1.');
+          'upgrading Gradle version from $existingVersionString to $gradleVersion7_6_1.');
       final String gradleDistributionUrlString = gradleDistributionUrl.group(0)!;
       final String upgradedDistributionUrl =
-        gradleDistributionUrlString.replaceAll(existingVersionString, _gradleVersion7_6_1);
+        gradleDistributionUrlString.replaceAll(existingVersionString, gradleVersion7_6_1);
       fileContents = fileContents.replaceFirst(gradleOrgVersionMatch, upgradedDistributionUrl);
     }
     return fileContents;

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

@@ -186,6 +186,24 @@ tasks.register("clean", Delete) {
             gradleWrapperToMigrate);
       });
 
+      testWithoutContext('skipped if error is encountered in migrate()', () {
+        final AndroidStudioJavaGradleConflictMigration migration = AndroidStudioJavaGradleConflictMigration(
+          bufferLogger,
+          project: project,
+          androidStudio: FakeAndroidStudio(version: androidStudioFlamingo),
+          fileSystem: FakeFileSystem(),
+          processUtils: FakeProcessUtils(),
+          platform: FakePlatform(),
+          os: FakeOperatingSystemUtils(),
+          androidSdk: FakeErroringAndroidSdk(javaVersion: '17'),
+        );
+        gradleWrapperPropertiesFile.writeAsStringSync(gradleWrapperToMigrate);
+        migration.migrate();
+        expect(bufferLogger.traceText, contains(errorWhileMigrating));
+        expect(gradleWrapperPropertiesFile.readAsStringSync(),
+            gradleWrapperToMigrate);
+      });
+
       testWithoutContext('skipped if android studio version is less than flamingo', () {
         final AndroidStudioJavaGradleConflictMigration migration = AndroidStudioJavaGradleConflictMigration(
           bufferLogger,
@@ -253,8 +271,9 @@ tasks.register("clean", Delete) {
         gradleWrapperPropertiesFile.writeAsStringSync(gradleWrapperToMigrate);
         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.'));
+        expect(bufferLogger.statusText, contains('Conflict detected between '
+            'Android Studio Java version and Gradle version, upgrading Gradle '
+            'version from 6.7 to $gradleVersion7_6_1.'));
       });
 
       testWithoutContext('change is not made when opt out flag is set', () {
@@ -314,6 +333,25 @@ class FakeAndroidSdk extends Fake implements AndroidSdk {
   }
 }
 
+class FakeErroringAndroidSdk extends Fake implements AndroidSdk {
+  FakeErroringAndroidSdk({required String javaVersion}) {
+    _javaVersion = javaVersion;
+  }
+
+  late String _javaVersion;
+
+  @override
+  String? getJavaVersion({
+    required AndroidStudio? androidStudio,
+    required FileSystem fileSystem,
+    required OperatingSystemUtils operatingSystemUtils,
+    required Platform platform,
+    required ProcessUtils processUtils,
+  }) {
+    throw const FileSystemException();
+  }
+}
+
 class FakeFileSystem extends Fake implements FileSystem {}
 class FakeProcessUtils extends Fake implements ProcessUtils {}
 class FakePlatform extends Fake implements Platform {}