From 50012832deeadf7edb84236f2174226ea9f38e9c Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Thu, 3 Jun 2021 14:38:04 -0700 Subject: [PATCH] Bump Protobuf Gradle Plugin to 0.8.16 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]: https://github.com/google/protobuf-gradle-plugin/issues/470 --- README.md | 4 ++-- 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 | 2 +- examples/example-alts/build.gradle | 2 +- examples/example-gauth/build.gradle | 2 +- examples/example-hostname/build.gradle | 2 +- examples/example-jwt-auth/build.gradle | 2 +- examples/example-tls/build.gradle | 2 +- examples/example-xds/build.gradle | 2 +- settings.gradle | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 35617fbc48..3a5f5680df 100644 --- a/README.md +++ b/README.md @@ -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 { diff --git a/examples/android/clientcache/build.gradle b/examples/android/clientcache/build.gradle index f5c361578f..ed4e815938 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.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 diff --git a/examples/android/helloworld/build.gradle b/examples/android/helloworld/build.gradle index f5c361578f..ed4e815938 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.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 diff --git a/examples/android/routeguide/build.gradle b/examples/android/routeguide/build.gradle index 51cde16810..980cf32ff8 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.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 diff --git a/examples/android/strictmode/build.gradle b/examples/android/strictmode/build.gradle index f5c361578f..ed4e815938 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.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 diff --git a/examples/build.gradle b/examples/build.gradle index 26e128e02d..938ea46bd7 100644 --- a/examples/build.gradle +++ b/examples/build.gradle @@ -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' } diff --git a/examples/example-alts/build.gradle b/examples/example-alts/build.gradle index 8bbfc6bd91..da2aec4e9a 100644 --- a/examples/example-alts/build.gradle +++ b/examples/example-alts/build.gradle @@ -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' } diff --git a/examples/example-gauth/build.gradle b/examples/example-gauth/build.gradle index db13767418..a5c35d80a8 100644 --- a/examples/example-gauth/build.gradle +++ b/examples/example-gauth/build.gradle @@ -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' } diff --git a/examples/example-hostname/build.gradle b/examples/example-hostname/build.gradle index b0c743e661..4b8bd8bec5 100644 --- a/examples/example-hostname/build.gradle +++ b/examples/example-hostname/build.gradle @@ -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 } diff --git a/examples/example-jwt-auth/build.gradle b/examples/example-jwt-auth/build.gradle index 81f1e26c09..9f6694e791 100644 --- a/examples/example-jwt-auth/build.gradle +++ b/examples/example-jwt-auth/build.gradle @@ -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' } diff --git a/examples/example-tls/build.gradle b/examples/example-tls/build.gradle index 4835af3f05..fd648ed6b4 100644 --- a/examples/example-tls/build.gradle +++ b/examples/example-tls/build.gradle @@ -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' } diff --git a/examples/example-xds/build.gradle b/examples/example-xds/build.gradle index f11b5ce011..c43bff1704 100644 --- a/examples/example-xds/build.gradle +++ b/examples/example-xds/build.gradle @@ -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' diff --git a/settings.gradle b/settings.gradle index fbee65a294..d552d95783 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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"