From da100e8e49a9e9500e25f8b20d7981b896aca47a Mon Sep 17 00:00:00 2001 From: Chengyuan Zhang Date: Mon, 21 Sep 2020 10:42:06 -0700 Subject: [PATCH] build, examples, README.md: Update protobuf gradle plugin version to 0.8.13 (#7355) Updated protobuf gradle plugin version to 0.8.13. Fixed Android Kokoro's memory issue by forcing to use a new Gradle daemon for building the previous commit. --- README.md | 2 +- buildscripts/kokoro/android.sh | 3 ++- 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/build.gradle | 4 ++-- examples/example-alts/build.gradle | 4 ++-- examples/example-gauth/build.gradle | 4 ++-- examples/example-jwt-auth/build.gradle | 4 ++-- examples/example-tls/build.gradle | 4 ++-- settings.gradle | 2 +- 12 files changed, 18 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index b1a66311d75..737fc40c1d6 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ For protobuf-based codegen integrated with the Gradle build system, you can use [protobuf-gradle-plugin][]: ```gradle plugins { - id 'com.google.protobuf' version '0.8.8' + id 'com.google.protobuf' version '0.8.13' } protobuf { diff --git a/buildscripts/kokoro/android.sh b/buildscripts/kokoro/android.sh index 951488f747d..33f3f7b20bf 100755 --- a/buildscripts/kokoro/android.sh +++ b/buildscripts/kokoro/android.sh @@ -89,8 +89,9 @@ new_apk_size="$(stat --printf=%s $HELLO_WORLD_OUTPUT_DIR/apk/release/app-release # Get the APK size and dex count stats using the pull request base commit cd $BASE_DIR/github/grpc-java -git checkout HEAD^ ./gradlew clean +git checkout HEAD^ +./gradlew --stop # use a new daemon to build the previous commit ./gradlew publishToMavenLocal cd examples/android/helloworld/ ../../gradlew build diff --git a/examples/android/clientcache/build.gradle b/examples/android/clientcache/build.gradle index 436383e2270..60883b8037c 100644 --- a/examples/android/clientcache/build.gradle +++ b/examples/android/clientcache/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:4.0.0' - classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.8" + classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.13" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/examples/android/helloworld/build.gradle b/examples/android/helloworld/build.gradle index 436383e2270..60883b8037c 100644 --- a/examples/android/helloworld/build.gradle +++ b/examples/android/helloworld/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:4.0.0' - classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.8" + classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.13" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/examples/android/routeguide/build.gradle b/examples/android/routeguide/build.gradle index cafba46c04b..4f1c7873371 100644 --- a/examples/android/routeguide/build.gradle +++ b/examples/android/routeguide/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:4.0.0' - classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.8" + classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.13" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/examples/android/strictmode/build.gradle b/examples/android/strictmode/build.gradle index 436383e2270..60883b8037c 100644 --- a/examples/android/strictmode/build.gradle +++ b/examples/android/strictmode/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:4.0.0' - classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.8" + classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.13" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/examples/build.gradle b/examples/build.gradle index 68bba439d65..aacb920e557 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -1,8 +1,8 @@ plugins { // Provide convenience executables for trying out the examples. id 'application' - // ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier gradle versions - id 'com.google.protobuf' version '0.8.8' + // ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions + id 'com.google.protobuf' version '0.8.13' // Generate IntelliJ IDEA's .idea & .iml project files id 'idea' } diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index 7b34c2da0e2..9e71cdb9f50 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -1,8 +1,8 @@ plugins { // Provide convenience executables for trying out the examples. id 'application' - // ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier gradle versions - id 'com.google.protobuf' version '0.8.8' + // ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions + id 'com.google.protobuf' version '0.8.13' // Generate IntelliJ IDEA's .idea & .iml project files id 'idea' } diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index 0a2a92d8fac..5283b4a19bc 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -1,8 +1,8 @@ plugins { // Provide convenience executables for trying out the examples. id 'application' - // ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier gradle versions - id 'com.google.protobuf' version '0.8.8' + // ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions + id 'com.google.protobuf' version '0.8.13' // Generate IntelliJ IDEA's .idea & .iml project files id 'idea' } diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index 588daf3794a..a258c98c484 100644 --- a/examples/example-jwt-auth/build.gradle +++ b/examples/example-jwt-auth/build.gradle @@ -1,8 +1,8 @@ plugins { // Provide convenience executables for trying out the examples. id 'application' - // ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier gradle versions - id 'com.google.protobuf' version '0.8.8' + // ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions + id 'com.google.protobuf' version '0.8.13' // Generate IntelliJ IDEA's .idea & .iml project files id 'idea' } diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index fbec7406092..bebb2946ce2 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -1,8 +1,8 @@ plugins { // Provide convenience executables for trying out the examples. id 'application' - // ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier gradle versions - id 'com.google.protobuf' version '0.8.8' + // ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions + id 'com.google.protobuf' version '0.8.13' // Generate IntelliJ IDEA's .idea & .iml project files id 'idea' } diff --git a/settings.gradle b/settings.gradle index 9592c7eda93..0b75e7f3859 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,7 +5,7 @@ pluginManagement { id "com.github.johnrengelman.shadow" version "2.0.4" id "com.github.kt3k.coveralls" version "2.0.1" id "com.google.osdetector" version "1.4.0" - id "com.google.protobuf" version "0.8.12" + id "com.google.protobuf" version "0.8.13" id "digital.wup.android-maven-publish" version "3.6.2" id "me.champeau.gradle.japicmp" version "0.2.5" id "me.champeau.gradle.jmh" version "0.5.0"