From ca6cecf034d9c18fcb6ea70309cc855e353aa0f8 Mon Sep 17 00:00:00 2001 From: Gary Qian Date: Mon, 25 Jul 2022 15:23:08 -0700 Subject: [PATCH] Upgrade Gradle and AGP versions to 7.5/7.2 and migrate examples/tests (#108197) --- dev/benchmarks/complex_layout/android/build.gradle | 2 +- dev/benchmarks/macrobenchmarks/android/build.gradle | 2 +- dev/benchmarks/microbenchmarks/android/build.gradle | 2 +- .../platform_views_layout/android/build.gradle | 2 +- .../android/build.gradle | 2 +- dev/benchmarks/test_apps/stocks/android/build.gradle | 2 +- .../android_views/android/build.gradle | 2 +- .../deferred_components_test/android/build.gradle | 2 +- .../flutter_gallery/android/build.gradle | 2 +- examples/api/android/build.gradle | 2 +- examples/flutter_view/android/build.gradle | 2 +- examples/hello_world/android/build.gradle | 2 +- examples/image_list/android/build.gradle | 2 +- examples/layers/android/build.gradle | 2 +- examples/platform_channel/android/build.gradle | 2 +- examples/platform_view/android/build.gradle | 2 +- .../flutter_tools/lib/src/android/gradle_utils.dart | 12 ++++++------ .../general.shard/android/gradle_errors_test.dart | 4 ++-- .../android/gradle_find_bundle_test.dart | 2 +- .../test/general.shard/android/gradle_test.dart | 6 +++--- .../general.shard/android/gradle_utils_test.dart | 4 ++-- .../android_plugin_example_app_build_test.dart | 6 +++--- 22 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dev/benchmarks/complex_layout/android/build.gradle b/dev/benchmarks/complex_layout/android/build.gradle index 77683ab1bff..c4428215757 100644 --- a/dev/benchmarks/complex_layout/android/build.gradle +++ b/dev/benchmarks/complex_layout/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/dev/benchmarks/macrobenchmarks/android/build.gradle b/dev/benchmarks/macrobenchmarks/android/build.gradle index 71333c78d07..c4428215757 100644 --- a/dev/benchmarks/macrobenchmarks/android/build.gradle +++ b/dev/benchmarks/macrobenchmarks/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/dev/benchmarks/microbenchmarks/android/build.gradle b/dev/benchmarks/microbenchmarks/android/build.gradle index 27fcdd5b7b0..298a2a773f1 100644 --- a/dev/benchmarks/microbenchmarks/android/build.gradle +++ b/dev/benchmarks/microbenchmarks/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/dev/benchmarks/platform_views_layout/android/build.gradle b/dev/benchmarks/platform_views_layout/android/build.gradle index 71333c78d07..c4428215757 100644 --- a/dev/benchmarks/platform_views_layout/android/build.gradle +++ b/dev/benchmarks/platform_views_layout/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle b/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle index 71333c78d07..c4428215757 100644 --- a/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle +++ b/dev/benchmarks/platform_views_layout_hybrid_composition/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/dev/benchmarks/test_apps/stocks/android/build.gradle b/dev/benchmarks/test_apps/stocks/android/build.gradle index 71333c78d07..c4428215757 100644 --- a/dev/benchmarks/test_apps/stocks/android/build.gradle +++ b/dev/benchmarks/test_apps/stocks/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/dev/integration_tests/android_views/android/build.gradle b/dev/integration_tests/android_views/android/build.gradle index 71333c78d07..c4428215757 100644 --- a/dev/integration_tests/android_views/android/build.gradle +++ b/dev/integration_tests/android_views/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/dev/integration_tests/deferred_components_test/android/build.gradle b/dev/integration_tests/deferred_components_test/android/build.gradle index f7ec09745ff..16238f40849 100644 --- a/dev/integration_tests/deferred_components_test/android/build.gradle +++ b/dev/integration_tests/deferred_components_test/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/dev/integration_tests/flutter_gallery/android/build.gradle b/dev/integration_tests/flutter_gallery/android/build.gradle index 71333c78d07..c4428215757 100644 --- a/dev/integration_tests/flutter_gallery/android/build.gradle +++ b/dev/integration_tests/flutter_gallery/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/examples/api/android/build.gradle b/examples/api/android/build.gradle index be54596383a..fcd2aee74cd 100644 --- a/examples/api/android/build.gradle +++ b/examples/api/android/build.gradle @@ -10,7 +10,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/examples/flutter_view/android/build.gradle b/examples/flutter_view/android/build.gradle index 71333c78d07..c4428215757 100644 --- a/examples/flutter_view/android/build.gradle +++ b/examples/flutter_view/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/examples/hello_world/android/build.gradle b/examples/hello_world/android/build.gradle index 71333c78d07..c4428215757 100644 --- a/examples/hello_world/android/build.gradle +++ b/examples/hello_world/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/examples/image_list/android/build.gradle b/examples/image_list/android/build.gradle index 71333c78d07..c4428215757 100644 --- a/examples/image_list/android/build.gradle +++ b/examples/image_list/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/examples/layers/android/build.gradle b/examples/layers/android/build.gradle index 71333c78d07..c4428215757 100644 --- a/examples/layers/android/build.gradle +++ b/examples/layers/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/examples/platform_channel/android/build.gradle b/examples/platform_channel/android/build.gradle index 71333c78d07..c4428215757 100644 --- a/examples/platform_channel/android/build.gradle +++ b/examples/platform_channel/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/examples/platform_view/android/build.gradle b/examples/platform_view/android/build.gradle index 71333c78d07..c4428215757 100644 --- a/examples/platform_view/android/build.gradle +++ b/examples/platform_view/android/build.gradle @@ -14,7 +14,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:{{agpVersion}}' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/packages/flutter_tools/lib/src/android/gradle_utils.dart b/packages/flutter_tools/lib/src/android/gradle_utils.dart index 2204ee4f6e8..17ff5aab148 100644 --- a/packages/flutter_tools/lib/src/android/gradle_utils.dart +++ b/packages/flutter_tools/lib/src/android/gradle_utils.dart @@ -27,10 +27,10 @@ import 'android_sdk.dart'; // For more information about the latest version, check: // https://developer.android.com/studio/releases/gradle-plugin#updating-gradle // https://kotlinlang.org/docs/gradle.html#plugin-and-versions -const String templateDefaultGradleVersion = '7.4'; -const String templateAndroidGradlePluginVersion = '7.1.2'; -const String templateDefaultGradleVersionForModule = '7.1.2'; -const String templateKotlinGradlePluginVersion = '1.6.10'; +const String templateDefaultGradleVersion = '7.5'; +const String templateAndroidGradlePluginVersion = '7.2.0'; +const String templateDefaultGradleVersionForModule = '7.2.0'; +const String templateKotlinGradlePluginVersion = '1.7.10'; // These versions should match the values in flutter.gradle (FlutterExtension). // The Flutter Gradle plugin is only applied to app projects, and modules that are built from source @@ -204,8 +204,8 @@ String getGradleVersionFor(String androidPluginVersion) { if (_isWithinVersionRange(androidPluginVersion, min: '4.0.0', max: '4.1.0')) { return '6.7'; } - if (_isWithinVersionRange(androidPluginVersion, min: '7.0', max: '7.4')) { - return '7.4'; + if (_isWithinVersionRange(androidPluginVersion, min: '7.0', max: '7.5')) { + return '7.5'; } throwToolExit('Unsupported Android Plugin version: $androidPluginVersion.'); } diff --git a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart index 9c207301ded..acdeac8c97d 100644 --- a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart +++ b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart @@ -907,10 +907,10 @@ A problem occurred evaluating project ':app'. '│ To fix this issue, replace the following content: │\n' '│ /android/build.gradle: │\n' "│ - classpath 'com.android.tools.build:gradle:' │\n" - "│ + classpath 'com.android.tools.build:gradle:7.1.2' │\n" + "│ + classpath 'com.android.tools.build:gradle:7.2.0' │\n" '│ /android/gradle/wrapper/gradle-wrapper.properties: │\n' '│ - https://services.gradle.org/distributions/gradle--all.zip │\n' - '│ + https://services.gradle.org/distributions/gradle-7.4-all.zip │\n' + '│ + https://services.gradle.org/distributions/gradle-7.5-all.zip │\n' '└──────────────────────────────────────────────────────────────────────────────────┘\n' ) ); diff --git a/packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart index a10c7549a9c..3d9b639af7b 100644 --- a/packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart +++ b/packages/flutter_tools/test/general.shard/android/gradle_find_bundle_test.dart @@ -357,7 +357,7 @@ void main() { 'gradle', label: 'gradle-expected-file-not-found', parameters: CustomDimensions.fromMap( { - 'cd37': 'androidGradlePluginVersion: 7.4, fileExtension: .aab', + 'cd37': 'androidGradlePluginVersion: 7.5, fileExtension: .aab', }), ), )); diff --git a/packages/flutter_tools/test/general.shard/android/gradle_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_test.dart index 3d9c48abe0c..413587ee14e 100644 --- a/packages/flutter_tools/test/general.shard/android/gradle_test.dart +++ b/packages/flutter_tools/test/general.shard/android/gradle_test.dart @@ -443,9 +443,9 @@ flutter: expect(getGradleVersionFor('4.0.0'), '6.7'); expect(getGradleVersionFor('4.1.0'), '6.7'); - expect(getGradleVersionFor('7.0'), '7.4'); - expect(getGradleVersionFor('7.1.2'), '7.4'); - expect(getGradleVersionFor('7.2'), '7.4'); + expect(getGradleVersionFor('7.0'), '7.5'); + expect(getGradleVersionFor('7.1.2'), '7.5'); + expect(getGradleVersionFor('7.2'), '7.5'); }); testWithoutContext('throws on unsupported versions', () { diff --git a/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart index b9e07520624..db04086956d 100644 --- a/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart +++ b/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart @@ -73,7 +73,7 @@ void main() { 'distributionPath=wrapper/dists\n' 'zipStoreBase=GRADLE_USER_HOME\n' 'zipStorePath=wrapper/dists\n' - 'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.4-all.zip\n'); + 'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.5-all.zip\n'); }); testWithoutContext('injects the wrapper when some files are missing', () { @@ -110,7 +110,7 @@ void main() { 'distributionPath=wrapper/dists\n' 'zipStoreBase=GRADLE_USER_HOME\n' 'zipStorePath=wrapper/dists\n' - 'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.4-all.zip\n'); + 'distributionUrl=https\\://services.gradle.org/distributions/gradle-7.5-all.zip\n'); }); testWithoutContext('injects the wrapper and the Gradle version is derivated from the AGP version', () { diff --git a/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart b/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart index 898a2eecd73..9c91e16d276 100644 --- a/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_plugin_example_app_build_test.dart @@ -58,12 +58,12 @@ void main() { final RegExp androidPluginRegExp = RegExp(r'com\.android\.tools\.build:gradle:(\d+\.\d+\.\d+)'); - // Use AGP 4.1.0 + // Use AGP 7.2.0 final String newBuildGradle = buildGradle.replaceAll( - androidPluginRegExp, 'com.android.tools.build:gradle:4.1.0'); + androidPluginRegExp, 'com.android.tools.build:gradle:7.2.0'); buildGradleFile.writeAsStringSync(newBuildGradle); - // Run flutter build apk using AGP 4.1.0 + // Run flutter build apk using AGP 7.2.0 result = processManager.runSync([ flutterBin, ...getLocalEngineArguments(),