Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build, examples, README.md: Update protobuf gradle plugin version to 0.8.13 #7355

Merged
merged 10 commits into from Sep 21, 2020
Merged

build, examples, README.md: Update protobuf gradle plugin version to 0.8.13 #7355

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3cbc584
Update protobuf gradle plugin version to 0.8.13
voidzcy Jun 8, 2020
283ad2b
Merge branch 'master' of github.com:grpc/grpc-java into doc/update_pr…
voidzcy Aug 24, 2020
71f9993
Try disable gradle daemon for builds.
voidzcy Aug 28, 2020
a5e5006
Merge branch 'master' of github.com:grpc/grpc-java into doc/update_pr…
voidzcy Sep 17, 2020
e9021f0
Add gradle daemon back.
voidzcy Sep 17, 2020
b960b20
Increment max Metaspace size.
voidzcy Sep 18, 2020
c6fa4ff
Try stop the eixsting daemon when building for the preivous commit.
voidzcy Sep 18, 2020
6c619e9
Reduce the max Metaspace size back to 512 MB, it shouldn't use that m…
voidzcy Sep 18, 2020
5a3e9f8
Add note for stopping daemon to build the previous commit.
voidzcy Sep 18, 2020
6e176af
Do clean before checking out to the previous commit.
voidzcy Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions buildscripts/kokoro/android.sh
View file
Open in desktop
Expand Up @@ -91,6 +91,7 @@ new_apk_size="$(stat --printf=%s $HELLO_WORLD_OUTPUT_DIR/apk/release/app-release
cd $BASE_DIR/github/grpc-java
git checkout HEAD^
./gradlew clean
./gradlew --stop # use a new daemon to build the previous commit
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should go above the ./gradlew clean since that clean is running at the new commit, or the ./gradlew clean should be moved before the git checkout HEAD^ (preferable).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

./gradlew publishToMavenLocal
cd examples/android/helloworld/
../../gradlew build
Expand Down
2 changes: 1 addition & 1 deletion examples/android/clientcache/build.gradle
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/android/helloworld/build.gradle
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/android/routeguide/build.gradle
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/android/strictmode/build.gradle
View file
Open in desktop
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/build.gradle
View file
Open in desktop
@@ -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'
}
Expand Down
4 changes: 2 additions & 2 deletions examples/example-alts/build.gradle
View file
Open in desktop
@@ -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'
}
Expand Down
4 changes: 2 additions & 2 deletions examples/example-gauth/build.gradle
View file
Open in desktop
@@ -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'
}
Expand Down
4 changes: 2 additions & 2 deletions examples/example-jwt-auth/build.gradle
View file
Open in desktop
@@ -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'
}
Expand Down
4 changes: 2 additions & 2 deletions examples/example-tls/build.gradle
View file
Open in desktop
@@ -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'
}
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Expand Up @@ -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"
Expand Down