build, examples, README.md: Update protobuf gradle plugin version to …

…0.8.13 (grpc#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.
dfawley · Jan 15, 2021 · 9b4b53a · 9b4b53a
1 parent 458bca3
commit 9b4b53a
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"