android-interop-testing: ErrorProne should ignore generated R class

This silences many MutablePublicArray warnings that we can't do anything about.
ejona86 · Dec 17, 2020 · 499694e · 499694e
1 parent 9c5427f
commit 499694e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/android-interop-testing/build.gradle b/android-interop-testing/build.gradle
@@ -93,6 +93,7 @@ tasks.withType(JavaCompile) {
     options.compilerArgs += [
             "-Xlint:-cast"
     ]
+    appendToProperty(it.options.errorprone.excludedPaths, ".*/R.java", "|")
     // Reuses source code from grpc-interop-testing, which targets Java 7 (no method references)
     options.errorprone.check("UnnecessaryAnonymousClass", CheckSeverity.OFF)
 }

diff --git a/build.gradle b/build.gradle
@@ -131,8 +131,11 @@ subprojects {
             }
 
             tasks.withType(JavaCompile) {
-                it.options.errorprone.excludedPaths = ".*/src/generated/[^/]+/java/.*" +
-                        "|.*/build/generated/source/proto/[^/]+/java/.*"
+                appendToProperty(
+                    it.options.errorprone.excludedPaths,
+                    ".*/src/generated/[^/]+/java/.*" +
+                        "|.*/build/generated/source/proto/[^/]+/java/.*",
+                    "|")
             }
         }
 
@@ -244,6 +247,14 @@ subprojects {
             }
             dependencies.runtimeOnly libraries.errorprone
         }
+
+        appendToProperty = { Property<String> property, String value, String separator ->
+            if (property.present) {
+                property.set(property.get() + separator + value)
+            } else {
+                property.set(value)
+            }
+        }
     }
 
     configurations {