Disable error prone on legacy proto check

curioswitch · Oct 2, 2024 · f84ab21 · f84ab21
1 parent 27757ca
commit f84ab21
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/buildSrc/src/main/kotlin/org.curioswitch.curiostack.errorprone.gradle.kts b/buildSrc/src/main/kotlin/org.curioswitch.curiostack.errorprone.gradle.kts
@@ -18,6 +18,12 @@ tasks {
   withType<JavaCompile>().configureEach {
     with(options) {
       errorprone {
+        if (!System.getenv("PROTOBUF_VERSION").orEmpty().isEmpty()) {
+          // Newer versions of error prone do not work with older protobuf, and we
+          // don't need it in our legacy check anyways.
+          enabled = false
+        }
+
         disableWarningsInGeneratedCode.set(true)
         allDisabledChecksAsWarnings.set(true)
 

diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -17,8 +17,7 @@ val DEPENDENCY_BOMS = listOf(
 val DEPENDENCY_SETS = listOf(
   DependencySet(
     "com.google.errorprone",
-    // Error Prone versions tied to protobuf
-    if (System.getenv("PROTOBUF_VERSION").orEmpty().isEmpty()) "2.33.0" else "2.18.0",
+    "2.33.0",
     listOf("error_prone_annotations", "error_prone_core")
   )
 )