Update protobuf plugin to remove deprecation warning (#4809)

open-telemetry · Dec 6, 2021 · f203ec9 · f203ec9
1 parent 5703a40
commit f203ec9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/conventions/build.gradle.kts b/conventions/build.gradle.kts
@@ -39,9 +39,8 @@ dependencies {
  // When updating, update above in plugins too
  implementation("com.diffplug.spotless:spotless-plugin-gradle:5.16.0")
  implementation("com.google.guava:guava:30.1-jre")
- implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.17")
+ implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.18")
  implementation("gradle.plugin.com.github.jengelman.gradle.plugins:shadow:7.0.0")
- implementation("gradle.plugin.com.google.protobuf:protobuf-gradle-plugin:0.8.17")
  implementation("org.ow2.asm:asm:9.1")
  implementation("org.ow2.asm:asm-tree:9.1")
  implementation("org.apache.httpcomponents:httpclient:4.5.13")

diff --git a/conventions/src/main/kotlin/otel.protobuf-conventions.gradle.kts b/conventions/src/main/kotlin/otel.protobuf-conventions.gradle.kts
@@ -7,7 +7,6 @@ plugins {
 }
 
 protobuf {
- val versions: Map<String, String> by project
  protoc {
  // The artifact spec for the Protobuf Compiler
  artifact = "com.google.protobuf:protoc:3.3.0"

diff --git a/gradle.properties b/gradle.properties
@@ -6,9 +6,7 @@ org.gradle.priority=low
 # Gradle default is 256m which causes issues with our build - https://docs.gradle.org/current/userguide/build_environment.html#sec:configuring_jvm_memory
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
 
-# TODO(anuraaga): Reenable closer to Gradle 8.0. Currently protobuf plugin fails due to bug
-# https://github.com/google/protobuf-gradle-plugin/issues/444
-# org.gradle.warning.mode=fail
+ org.gradle.warning.mode=fail
 
 # To allow caching more tasks in buildSrc project
 # This property is not mentioned in Gradle documentation