From 784e6b62f46ec5b398e9afb04c8507a72439b4e5 Mon Sep 17 00:00:00 2001 From: Eric Gribkoff Date: Mon, 6 Jul 2020 15:40:45 -0700 Subject: [PATCH] Upgrade to Gradle 6.5.1 --- build.gradle | 6 ++++++ examples/android/clientcache/build.gradle | 2 +- examples/android/helloworld/build.gradle | 2 +- examples/android/routeguide/build.gradle | 2 +- examples/android/strictmode/build.gradle | 2 +- examples/gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 73a1fa1c54..d8f56ecb5e 100644 --- a/build.gradle +++ b/build.gradle @@ -41,6 +41,12 @@ subprojects { } } + tasks.withType(GenerateModuleMetadata) { + // Module metadata, introduced in Gradle 6.0, conflicts with our publishing task for + // grpc-alts and grpc-compiler. + enabled = false + } + def isAndroid = project.name in [ 'grpc-android', 'grpc-android-interop-testing', 'grpc-cronet'] diff --git a/examples/android/clientcache/build.gradle b/examples/android/clientcache/build.gradle index 4e934ef68b..2075f4cc7a 100644 --- a/examples/android/clientcache/build.gradle +++ b/examples/android/clientcache/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.8" // NOTE: Do not place your application dependencies here; they belong diff --git a/examples/android/helloworld/build.gradle b/examples/android/helloworld/build.gradle index 4e934ef68b..2075f4cc7a 100644 --- a/examples/android/helloworld/build.gradle +++ b/examples/android/helloworld/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.8" // NOTE: Do not place your application dependencies here; they belong diff --git a/examples/android/routeguide/build.gradle b/examples/android/routeguide/build.gradle index cf0116d9f7..4003a2cedb 100644 --- a/examples/android/routeguide/build.gradle +++ b/examples/android/routeguide/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.8" // NOTE: Do not place your application dependencies here; they belong diff --git a/examples/android/strictmode/build.gradle b/examples/android/strictmode/build.gradle index 4e934ef68b..2075f4cc7a 100644 --- a/examples/android/strictmode/build.gradle +++ b/examples/android/strictmode/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.8" // NOTE: Do not place your application dependencies here; they belong diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index 7c4388a921..bb8b2fc26b 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7c4388a921..bb8b2fc26b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists