From 4d404da6dfd70a029489ed09a84d05c72d8c3387 Mon Sep 17 00:00:00 2001 From: Emmanuel Garcia Date: Fri, 13 Sep 2019 19:37:07 -0700 Subject: [PATCH] Update Kotlin and Gradle version (#40181) --- .../complex_layout/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../macrobenchmarks/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../microbenchmarks/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../bin/tasks/gradle_plugin_bundle_test.dart | 10 ++++----- .../android_host_app/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android_views/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../channels/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../codegen/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../external_ui/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../flavors/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../image_loading/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../named_isolates/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../platform_interaction/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- dev/integration_tests/ui/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- dev/manual_tests/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/catalog/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/flutter_gallery/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/flutter_view/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/hello_world/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/layers/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../platform_channel/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/platform_view/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/stocks/android/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- packages/flutter_tools/gradle/flutter.gradle | 22 +------------------ .../flutter_tools/lib/src/android/gradle.dart | 4 ++-- .../app/android-java.tmpl/build.gradle | 2 +- .../app/android-kotlin.tmpl/build.gradle | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../android/gradle/build.gradle.copy.tmpl | 2 +- .../android-java.tmpl/build.gradle.tmpl | 2 +- .../android-kotlin.tmpl/build.gradle.tmpl | 4 ++-- .../general.shard/android/gradle_test.dart | 8 +++---- 56 files changed, 66 insertions(+), 86 deletions(-) diff --git a/dev/benchmarks/complex_layout/android/build.gradle b/dev/benchmarks/complex_layout/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/benchmarks/complex_layout/android/build.gradle +++ b/dev/benchmarks/complex_layout/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties b/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/benchmarks/macrobenchmarks/android/build.gradle b/dev/benchmarks/macrobenchmarks/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/benchmarks/macrobenchmarks/android/build.gradle +++ b/dev/benchmarks/macrobenchmarks/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/benchmarks/macrobenchmarks/android/gradle/wrapper/gradle-wrapper.properties b/dev/benchmarks/macrobenchmarks/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/dev/benchmarks/macrobenchmarks/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/benchmarks/macrobenchmarks/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/benchmarks/microbenchmarks/android/build.gradle b/dev/benchmarks/microbenchmarks/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/benchmarks/microbenchmarks/android/build.gradle +++ b/dev/benchmarks/microbenchmarks/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/benchmarks/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties b/dev/benchmarks/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/dev/benchmarks/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/benchmarks/microbenchmarks/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart b/dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart index ec026f75e9..204743e677 100644 --- a/dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart +++ b/dev/devicelab/bin/tasks/gradle_plugin_bundle_test.dart @@ -23,7 +23,7 @@ Future main() async { 'outputs', 'bundle', 'release', - 'app.aab', + 'app-release.aab', ); checkItContains([ 'base/manifest/AndroidManifest.xml', @@ -54,7 +54,7 @@ Future main() async { 'outputs', 'bundle', 'productionRelease', - 'app.aab', + 'app-production-release.aab', ); checkItContains([ 'base/manifest/AndroidManifest.xml', @@ -90,7 +90,7 @@ Future main() async { 'outputs', 'bundle', 'flavor_underscoreRelease', - 'app.aab', + 'app-flavor_underscore-release.aab', ); checkItContains([ 'base/manifest/AndroidManifest.xml', @@ -125,7 +125,7 @@ Future main() async { 'outputs', 'bundle', 'productionRelease', - 'app.aab', + 'app-production-release.aab', ); checkItContains([ 'base/manifest/AndroidManifest.xml', @@ -149,7 +149,7 @@ Future main() async { 'outputs', 'bundle', 'release', - 'app.aab', + 'app-release.aab', ); final Iterable bundleFiles = await getFilesInAppBundle(releaseBundle); diff --git a/dev/integration_tests/android_host_app/build.gradle b/dev/integration_tests/android_host_app/build.gradle index e006ab47b4..9ed16f9b4d 100644 --- a/dev/integration_tests/android_host_app/build.gradle +++ b/dev/integration_tests/android_host_app/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/integration_tests/android_host_app/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/android_host_app/gradle/wrapper/gradle-wrapper.properties index 807a9a8414..f6c8f50ffd 100644 --- a/dev/integration_tests/android_host_app/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/android_host_app/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/integration_tests/android_semantics_testing/android/build.gradle b/dev/integration_tests/android_semantics_testing/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/integration_tests/android_semantics_testing/android/build.gradle +++ b/dev/integration_tests/android_semantics_testing/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/integration_tests/android_semantics_testing/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/android_semantics_testing/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100755 --- a/dev/integration_tests/android_semantics_testing/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/android_semantics_testing/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/integration_tests/android_views/android/build.gradle b/dev/integration_tests/android_views/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/integration_tests/android_views/android/build.gradle +++ b/dev/integration_tests/android_views/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/integration_tests/android_views/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/android_views/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/dev/integration_tests/android_views/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/android_views/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/integration_tests/channels/android/build.gradle b/dev/integration_tests/channels/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/integration_tests/channels/android/build.gradle +++ b/dev/integration_tests/channels/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100755 --- a/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/integration_tests/codegen/android/build.gradle b/dev/integration_tests/codegen/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/integration_tests/codegen/android/build.gradle +++ b/dev/integration_tests/codegen/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/integration_tests/codegen/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/codegen/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100755 --- a/dev/integration_tests/codegen/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/codegen/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/integration_tests/external_ui/android/build.gradle b/dev/integration_tests/external_ui/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/integration_tests/external_ui/android/build.gradle +++ b/dev/integration_tests/external_ui/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/integration_tests/external_ui/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/external_ui/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/dev/integration_tests/external_ui/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/external_ui/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/integration_tests/flavors/android/build.gradle b/dev/integration_tests/flavors/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/integration_tests/flavors/android/build.gradle +++ b/dev/integration_tests/flavors/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/integration_tests/image_loading/android/build.gradle b/dev/integration_tests/image_loading/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/integration_tests/image_loading/android/build.gradle +++ b/dev/integration_tests/image_loading/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/integration_tests/image_loading/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/image_loading/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100755 --- a/dev/integration_tests/image_loading/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/image_loading/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/integration_tests/named_isolates/android/build.gradle b/dev/integration_tests/named_isolates/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/integration_tests/named_isolates/android/build.gradle +++ b/dev/integration_tests/named_isolates/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/integration_tests/named_isolates/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/named_isolates/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/dev/integration_tests/named_isolates/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/named_isolates/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/integration_tests/platform_interaction/android/build.gradle b/dev/integration_tests/platform_interaction/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/integration_tests/platform_interaction/android/build.gradle +++ b/dev/integration_tests/platform_interaction/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/integration_tests/platform_interaction/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/platform_interaction/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100755 --- a/dev/integration_tests/platform_interaction/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/platform_interaction/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/integration_tests/ui/android/build.gradle b/dev/integration_tests/ui/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/integration_tests/ui/android/build.gradle +++ b/dev/integration_tests/ui/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/integration_tests/ui/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/ui/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/dev/integration_tests/ui/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/ui/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/dev/manual_tests/android/build.gradle b/dev/manual_tests/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/dev/manual_tests/android/build.gradle +++ b/dev/manual_tests/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/dev/manual_tests/android/gradle/wrapper/gradle-wrapper.properties b/dev/manual_tests/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100755 --- a/dev/manual_tests/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/manual_tests/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/examples/catalog/android/build.gradle b/examples/catalog/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/examples/catalog/android/build.gradle +++ b/examples/catalog/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/examples/catalog/android/gradle/wrapper/gradle-wrapper.properties b/examples/catalog/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/examples/catalog/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/catalog/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/examples/flutter_gallery/android/build.gradle b/examples/flutter_gallery/android/build.gradle index db728801d8..498448e786 100644 --- a/examples/flutter_gallery/android/build.gradle +++ b/examples/flutter_gallery/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/examples/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties b/examples/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/examples/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/examples/flutter_view/android/build.gradle b/examples/flutter_view/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/examples/flutter_view/android/build.gradle +++ b/examples/flutter_view/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/examples/flutter_view/android/gradle/wrapper/gradle-wrapper.properties b/examples/flutter_view/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/examples/flutter_view/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/flutter_view/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/examples/hello_world/android/build.gradle b/examples/hello_world/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/examples/hello_world/android/build.gradle +++ b/examples/hello_world/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties b/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/examples/layers/android/build.gradle b/examples/layers/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/examples/layers/android/build.gradle +++ b/examples/layers/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/examples/layers/android/gradle/wrapper/gradle-wrapper.properties b/examples/layers/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/examples/layers/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/layers/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/examples/platform_channel/android/build.gradle b/examples/platform_channel/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/examples/platform_channel/android/build.gradle +++ b/examples/platform_channel/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/examples/platform_channel/android/gradle/wrapper/gradle-wrapper.properties b/examples/platform_channel/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/examples/platform_channel/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/platform_channel/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/examples/platform_view/android/build.gradle b/examples/platform_view/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/examples/platform_view/android/build.gradle +++ b/examples/platform_view/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/examples/platform_view/android/gradle/wrapper/gradle-wrapper.properties b/examples/platform_view/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/examples/platform_view/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/platform_view/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/examples/stocks/android/build.gradle b/examples/stocks/android/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/examples/stocks/android/build.gradle +++ b/examples/stocks/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/examples/stocks/android/gradle/wrapper/gradle-wrapper.properties b/examples/stocks/android/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100755 --- a/examples/stocks/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/stocks/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/packages/flutter_tools/gradle/flutter.gradle b/packages/flutter_tools/gradle/flutter.gradle index e11d7ffbf8..4d65284c7e 100644 --- a/packages/flutter_tools/gradle/flutter.gradle +++ b/packages/flutter_tools/gradle/flutter.gradle @@ -28,7 +28,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } @@ -974,23 +974,3 @@ class FlutterPluginTask extends DefaultTask { } } } - -gradle.useLogger(new FlutterEventLogger()) - -class FlutterEventLogger extends BuildAdapter implements TaskExecutionListener { - String mostRecentTask = "" - - void beforeExecute(Task task) { - mostRecentTask = task.name - } - - void afterExecute(Task task, TaskState state) {} - - void buildFinished(BuildResult result) { - if (result.failure != null) { - if (!(result.failure instanceof GradleException) || !mostRecentTask.startsWith(FlutterPlugin.FLUTTER_BUILD_PREFIX)) { - result.rethrowFailure() - } - } - } -} diff --git a/packages/flutter_tools/lib/src/android/gradle.dart b/packages/flutter_tools/lib/src/android/gradle.dart index c670388316..180312e32a 100644 --- a/packages/flutter_tools/lib/src/android/gradle.dart +++ b/packages/flutter_tools/lib/src/android/gradle.dart @@ -403,7 +403,7 @@ bool _isWithinVersionRange(String targetVersion, {String min, String max}) { parsedTargetVersion <= Version.parse(max); } -const String defaultGradleVersion = '4.10.2'; +const String defaultGradleVersion = '5.6.2'; /// Returns the Gradle version that is required by the given Android Gradle plugin version /// by picking the largest compatible version from @@ -440,7 +440,7 @@ String getGradleVersionFor(String androidPluginVersion) { return '4.10.2'; } if (_isWithinVersionRange(androidPluginVersion, min: '3.4.0', max: '3.5.0')) { - return '5.1.1'; + return '5.6.2'; } throwToolExit('Unsuported Android Plugin version: $androidPluginVersion.'); return ''; diff --git a/packages/flutter_tools/templates/app/android-java.tmpl/build.gradle b/packages/flutter_tools/templates/app/android-java.tmpl/build.gradle index bb8a303898..e0d7ae2c11 100644 --- a/packages/flutter_tools/templates/app/android-java.tmpl/build.gradle +++ b/packages/flutter_tools/templates/app/android-java.tmpl/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/packages/flutter_tools/templates/app/android-kotlin.tmpl/build.gradle b/packages/flutter_tools/templates/app/android-kotlin.tmpl/build.gradle index b7faad8f59..3100ad2d55 100644 --- a/packages/flutter_tools/templates/app/android-kotlin.tmpl/build.gradle +++ b/packages/flutter_tools/templates/app/android-kotlin.tmpl/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.2.71' + ext.kotlin_version = '1.3.50' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/packages/flutter_tools/templates/app/android.tmpl/gradle/wrapper/gradle-wrapper.properties b/packages/flutter_tools/templates/app/android.tmpl/gradle/wrapper/gradle-wrapper.properties index 2819f022f1..296b146b73 100644 --- a/packages/flutter_tools/templates/app/android.tmpl/gradle/wrapper/gradle-wrapper.properties +++ b/packages/flutter_tools/templates/app/android.tmpl/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip diff --git a/packages/flutter_tools/templates/module/android/gradle/build.gradle.copy.tmpl b/packages/flutter_tools/templates/module/android/gradle/build.gradle.copy.tmpl index 6cdcf3905e..9a17202836 100644 --- a/packages/flutter_tools/templates/module/android/gradle/build.gradle.copy.tmpl +++ b/packages/flutter_tools/templates/module/android/gradle/build.gradle.copy.tmpl @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl index c16a39446f..dca5162228 100644 --- a/packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl +++ b/packages/flutter_tools/templates/plugin/android-java.tmpl/build.gradle.tmpl @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' } } diff --git a/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl b/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl index 95a3ea49ab..db5fd28499 100644 --- a/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl +++ b/packages/flutter_tools/templates/plugin/android-kotlin.tmpl/build.gradle.tmpl @@ -2,14 +2,14 @@ group '{{androidIdentifier}}' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.2.71' + ext.kotlin_version = '1.3.50' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } 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 b650ab0766..1ab626d65d 100644 --- a/packages/flutter_tools/test/general.shard/android/gradle_test.dart +++ b/packages/flutter_tools/test/general.shard/android/gradle_test.dart @@ -840,8 +840,8 @@ flutter: expect(getGradleVersionFor('3.3.0'), '4.10.2'); expect(getGradleVersionFor('3.3.2'), '4.10.2'); - expect(getGradleVersionFor('3.4.0'), '5.1.1'); - expect(getGradleVersionFor('3.5.0'), '5.1.1'); + expect(getGradleVersionFor('3.4.0'), '5.6.2'); + expect(getGradleVersionFor('3.5.0'), '5.6.2'); }); test('throws on unsupported versions', () { @@ -1014,7 +1014,7 @@ at org.gradle.wrapper.GradleWrapperMain.main(GradleWrapperMain.java:61)'''; 'distributionPath=wrapper/dists\n' 'zipStoreBase=GRADLE_USER_HOME\n' 'zipStorePath=wrapper/dists\n' - 'distributionUrl=https\\://services.gradle.org/distributions/gradle-4.10.2-all.zip\n'); + 'distributionUrl=https\\://services.gradle.org/distributions/gradle-5.6.2-all.zip\n'); }, overrides: { Cache: () => Cache(rootOverride: tempDir), FileSystem: () => memoryFileSystem, @@ -1054,7 +1054,7 @@ at org.gradle.wrapper.GradleWrapperMain.main(GradleWrapperMain.java:61)'''; 'distributionPath=wrapper/dists\n' 'zipStoreBase=GRADLE_USER_HOME\n' 'zipStorePath=wrapper/dists\n' - 'distributionUrl=https\\://services.gradle.org/distributions/gradle-4.10.2-all.zip\n'); + 'distributionUrl=https\\://services.gradle.org/distributions/gradle-5.6.2-all.zip\n'); }, overrides: { Cache: () => Cache(rootOverride: tempDir), FileSystem: () => memoryFileSystem,