From 34e866ef2b8f7bab2f9ec27a1ed646d9983b45b5 Mon Sep 17 00:00:00 2001
From: Andrew Kent <andrew.kent@datadoghq.com>
Date: Tue, 18 Dec 2018 16:34:38 -0800
Subject: [PATCH] make error-prone opt-in

---
 gradle/java.gradle | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/gradle/java.gradle b/gradle/java.gradle
index fc54595ec9..6a945cf1b2 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -15,12 +15,15 @@ lombok { // optional: values below are the defaults
   sha256 = ""
 }
 
-apply plugin: "net.ltgt.errorprone"
-tasks.withType(JavaCompile) {
-  options.compilerArgs += ['-Xep:FutureReturnValueIgnored:OFF']
-  // workaround for: https://github.com/google/error-prone/issues/780
-  options.compilerArgs += ['-Xep:ParameterName:OFF']
-  options.compilerArgs += ['-XepDisableWarningsInGeneratedCode']
+if (project.hasProperty('enableErrorProne')) {
+  apply plugin: "net.ltgt.errorprone"
+  tasks.withType(JavaCompile) {
+    outputs.upToDateWhen { false }
+    options.compilerArgs += ['-Xep:FutureReturnValueIgnored:OFF']
+    // workaround for: https://github.com/google/error-prone/issues/780
+    options.compilerArgs += ['-Xep:ParameterName:OFF']
+    options.compilerArgs += ['-XepDisableWarningsInGeneratedCode']
+  }
 }
 
 apply plugin: "eclipse"
@@ -262,4 +265,3 @@ plugins.withType(BasePlugin) {
     otherTasks*.mustRunAfter deleteTasks
   }
 }
-