Skip to content

Commit

Permalink
Bump Protobuf Gradle Plugin to 0.8.16
Browse files Browse the repository at this point in the history
This version works around a warning about DuplicateStrategy in Gradle 6
that will be an error in Gradle 7 caused by [a bug in the plugin][1].
Bumping the version makes a clean build with `--warning-mode all` (at
least if skipping Android and codegen).

[1]: google/protobuf-gradle-plugin#470
  • Loading branch information
ejona86 committed Jun 4, 2021
1 parent d8d3784 commit 5001283
Showing 13 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -134,7 +134,7 @@ For non-Android protobuf-based codegen integrated with the Gradle build system,
you can use [protobuf-gradle-plugin][]:
```gradle
plugins {
id 'com.google.protobuf' version '0.8.15'
id 'com.google.protobuf' version '0.8.16'
}
protobuf {
@@ -167,7 +167,7 @@ use protobuf-gradle-plugin but specify the 'lite' options:

```gradle
plugins {
id 'com.google.protobuf' version '0.8.15'
id 'com.google.protobuf' version '0.8.16'
}
protobuf {
2 changes: 1 addition & 1 deletion examples/android/clientcache/build.gradle
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.15"
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.16"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
2 changes: 1 addition & 1 deletion examples/android/helloworld/build.gradle
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.15"
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.16"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
2 changes: 1 addition & 1 deletion examples/android/routeguide/build.gradle
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.15"
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.16"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
2 changes: 1 addition & 1 deletion examples/android/strictmode/build.gradle
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.15"
classpath "com.google.protobuf:protobuf-gradle-plugin:0.8.16"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
2 changes: 1 addition & 1 deletion examples/build.gradle
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ plugins {
// Provide convenience executables for trying out the examples.
id 'application'
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
id 'com.google.protobuf' version '0.8.15'
id 'com.google.protobuf' version '0.8.16'
// Generate IntelliJ IDEA's .idea & .iml project files
id 'idea'
}
2 changes: 1 addition & 1 deletion examples/example-alts/build.gradle
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ plugins {
// Provide convenience executables for trying out the examples.
id 'application'
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
id 'com.google.protobuf' version '0.8.15'
id 'com.google.protobuf' version '0.8.16'
// Generate IntelliJ IDEA's .idea & .iml project files
id 'idea'
}
2 changes: 1 addition & 1 deletion examples/example-gauth/build.gradle
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ plugins {
// Provide convenience executables for trying out the examples.
id 'application'
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
id 'com.google.protobuf' version '0.8.15'
id 'com.google.protobuf' version '0.8.16'
// Generate IntelliJ IDEA's .idea & .iml project files
id 'idea'
}
2 changes: 1 addition & 1 deletion examples/example-hostname/build.gradle
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ plugins {
id 'application' // Provide convenience executables for trying out the examples.
id 'java'

id "com.google.protobuf" version "0.8.15"
id "com.google.protobuf" version "0.8.16"
id 'com.google.cloud.tools.jib' version '2.7.0' // For releasing to Docker Hub
}

2 changes: 1 addition & 1 deletion examples/example-jwt-auth/build.gradle
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ plugins {
// Provide convenience executables for trying out the examples.
id 'application'
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
id 'com.google.protobuf' version '0.8.15'
id 'com.google.protobuf' version '0.8.16'
// Generate IntelliJ IDEA's .idea & .iml project files
id 'idea'
}
2 changes: 1 addition & 1 deletion examples/example-tls/build.gradle
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ plugins {
// Provide convenience executables for trying out the examples.
id 'application'
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
id 'com.google.protobuf' version '0.8.15'
id 'com.google.protobuf' version '0.8.16'
// Generate IntelliJ IDEA's .idea & .iml project files
id 'idea'
}
2 changes: 1 addition & 1 deletion examples/example-xds/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'application' // Provide convenience executables for trying out the examples.
// ASSUMES GRADLE 5.6 OR HIGHER. Use plugin version 0.8.10 with earlier gradle versions
id 'com.google.protobuf' version '0.8.15'
id 'com.google.protobuf' version '0.8.16'
// Generate IntelliJ IDEA's .idea & .iml project files
id 'idea'
id 'java'
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ pluginManagement {
id "com.github.johnrengelman.shadow" version "6.1.0"
id "com.github.kt3k.coveralls" version "2.10.2"
id "com.google.osdetector" version "1.6.2"
id "com.google.protobuf" version "0.8.15"
id "com.google.protobuf" version "0.8.16"
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.2"

0 comments on commit 5001283

Please sign in to comment.