From 1fb72ef6c1df2734003c74e5c23f39cc38d81e91 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Thu, 8 Mar 2018 16:55:16 -0800
Subject: [PATCH] Ignore proto-generated code for ErrorProne

Previously if protobuf-generated code triggered ErrorProne we'd have to disable
the failing check for all code in that task. With -XepExcludedPaths we can
disable the ErrorProne-checking just for protobuf. Note that we continue using
ErrorProne on our generated code. Also note this only applies to ErrorProne
checks; JDK checks still require task-level disabling.
---
 build.gradle               |  6 ++++--
 compiler/build.gradle      | 11 ++++++-----
 protobuf-lite/build.gradle |  3 +--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7e5d0096f7..9a60aba1a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -175,8 +175,10 @@ subprojects {
           [compileJava, compileTestJava, compileJmhJava].each() {
             // Protobuf-generated code produces some warnings.
             // https://github.com/google/protobuf/issues/2718
-            it.options.compilerArgs += ["-Xlint:-cast", "-Xep:MissingOverride:OFF",
-                "-Xep:ReferenceEquality:OFF", "-Xep:FunctionalInterfaceClash:OFF"]
+            it.options.compilerArgs += [
+                "-Xlint:-cast",
+                "-XepExcludedPaths:.*/src/generated/[^/]+/java/.*",
+            ]
           }
         }
 
diff --git a/compiler/build.gradle b/compiler/build.gradle
index 1fef805fa9..53a7352784 100644
--- a/compiler/build.gradle
+++ b/compiler/build.gradle
@@ -151,15 +151,16 @@ sourceSets {
 }
 
 compileTestJava {
-  options.compilerArgs += ["-Xlint:-cast", "-Xep:MissingOverride:OFF",
-      "-Xep:ReferenceEquality:OFF", "-Xep:FunctionalInterfaceClash:OFF"]
+  options.compilerArgs += [
+      "-Xlint:-cast",
+      "-XepExcludedPaths:.*/build/generated/source/proto/.*",
+  ]
 }
 
 compileTestLiteJava {
+  options.compilerArgs = compileTestJava.options.compilerArgs
   // Protobuf-generated Lite produces quite a few warnings.
-  options.compilerArgs += ["-Xlint:-rawtypes", "-Xlint:-unchecked",
-      "-Xep:MissingOverride:OFF", "-Xep:ReferenceEquality:OFF",
-      "-Xep:FallThrough:OFF"]
+  options.compilerArgs += ["-Xlint:-rawtypes", "-Xlint:-unchecked", "-Xlint:-fallthrough"]
 }
 
 compileTestNanoJava {
diff --git a/protobuf-lite/build.gradle b/protobuf-lite/build.gradle
index e7342be75d..719910fa1c 100644
--- a/protobuf-lite/build.gradle
+++ b/protobuf-lite/build.gradle
@@ -28,8 +28,7 @@ dependencies {
 compileTestJava {
   // Protobuf-generated Lite produces quite a few warnings.
   options.compilerArgs += ["-Xlint:-rawtypes", "-Xlint:-unchecked", "-Xlint:-fallthrough",
-        "-Xep:MissingOverride:OFF", "-Xep:ReferenceEquality:OFF", "-Xep:FallThrough:OFF",
-        "-Xep:JavaLangClash:OFF" /* The Enum protobuf clashes */]
+        "-XepExcludedPaths:.*/build/generated/source/proto/.*"]
 }
 
 protobuf {