grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Chengyuan Zhang 2020-09-21 10:42:06 -07:00 committed by GitHub
parent b31d6830a2
commit da100e8e49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -133,7 +133,7 @@ For protobuf-based codegen integrated with the Gradle build system, you can use
[protobuf-gradle-plugin][]: [protobuf-gradle-plugin][]:
```gradle ```gradle
plugins { plugins {
id 'com.google.protobuf' version '0.8.8' id 'com.google.protobuf' version '0.8.13'
} }
protobuf { protobuf {

3
buildscripts/kokoro/android.sh
View File

@ -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 # Get the APK size and dex count stats using the pull request base commit
cd $BASE_DIR/github/grpc-java cd $BASE_DIR/github/grpc-java
git checkout HEAD^
./gradlew clean ./gradlew clean
git checkout HEAD^
./gradlew --stop # use a new daemon to build the previous commit
./gradlew publishToMavenLocal ./gradlew publishToMavenLocal
cd examples/android/helloworld/ cd examples/android/helloworld/
../../gradlew build ../../gradlew build

2
examples/android/clientcache/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0' 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

2
examples/android/helloworld/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0' 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

2
examples/android/routeguide/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0' 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

2
examples/android/strictmode/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0' 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 // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

4
examples/build.gradle
View File

@ -1,8 +1,8 @@
plugins { plugins {
// Provide convenience executables for trying out the examples. // Provide convenience executables for trying out the examples.
id 'application' id 'application'
// ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier gradle versions // ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
id 'com.google.protobuf' version '0.8.8' id 'com.google.protobuf' version '0.8.13'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
} }

4
examples/example-alts/build.gradle
View File

@ -1,8 +1,8 @@
plugins { plugins {
// Provide convenience executables for trying out the examples. // Provide convenience executables for trying out the examples.
id 'application' id 'application'
// ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier gradle versions // ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
id 'com.google.protobuf' version '0.8.8' id 'com.google.protobuf' version '0.8.13'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
} }

4
examples/example-gauth/build.gradle
View File

@ -1,8 +1,8 @@
plugins { plugins {
// Provide convenience executables for trying out the examples. // Provide convenience executables for trying out the examples.
id 'application' id 'application'
// ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier gradle versions // ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
id 'com.google.protobuf' version '0.8.8' id 'com.google.protobuf' version '0.8.13'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
} }

4
examples/example-jwt-auth/build.gradle
View File

@ -1,8 +1,8 @@
plugins { plugins {
// Provide convenience executables for trying out the examples. // Provide convenience executables for trying out the examples.
id 'application' id 'application'
// ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier gradle versions // ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
id 'com.google.protobuf' version '0.8.8' id 'com.google.protobuf' version '0.8.13'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
} }

4
examples/example-tls/build.gradle
View File

@ -1,8 +1,8 @@
plugins { plugins {
// Provide convenience executables for trying out the examples. // Provide convenience executables for trying out the examples.
id 'application' id 'application'
// ASSUMES GRADLE 2.12 OR HIGHER. Use plugin version 0.7.5 with earlier gradle versions // ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
id 'com.google.protobuf' version '0.8.8' id 'com.google.protobuf' version '0.8.13'
// Generate IntelliJ IDEA's .idea & .iml project files // Generate IntelliJ IDEA's .idea & .iml project files
id 'idea' id 'idea'
} }

2
settings.gradle
View File

@ -5,7 +5,7 @@ pluginManagement {
id "com.github.johnrengelman.shadow" version "2.0.4" id "com.github.johnrengelman.shadow" version "2.0.4"
id "com.github.kt3k.coveralls" version "2.0.1" id "com.github.kt3k.coveralls" version "2.0.1"
id "com.google.osdetector" version "1.4.0" 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 "digital.wup.android-maven-publish" version "3.6.2"
id "me.champeau.gradle.japicmp" version "0.2.5" id "me.champeau.gradle.japicmp" version "0.2.5"
id "me.champeau.gradle.jmh" version "0.5.0" id "me.champeau.gradle.jmh" version "0.5.0"