From d3cb7751014289b5e84ed8b11397aa35663f828a Mon Sep 17 00:00:00 2001
From: Andrew Gaul <gaul@determined.ai>
Date: Tue, 30 Jan 2018 08:35:58 -0800
Subject: [PATCH 1/3] Configure error prone

Disable a few noisy warnings.
---
 app/build.gradle | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/app/build.gradle b/app/build.gradle
index 4a1cb3d94..027b25695 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -376,3 +376,37 @@ android.applicationVariants.all { variant ->
         exclude '**/R.java'
     }
 }
+
+buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13"
+    }
+}
+
+apply plugin: "net.ltgt.errorprone"
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs += [
+        '-Xep:CatchFail:OFF',
+        '-Xep:ClassCanBeStatic:OFF',
+        '-Xep:DateFormatConstant:OFF',
+        '-Xep:DefaultCharset:OFF',
+        '-Xep:FormatString:OFF',
+        '-Xep:JavaLangClash:OFF',
+        '-Xep:MissingCasesInEnumSwitch:OFF',
+        '-Xep:MissingOverride:OFF',
+        '-Xep:NonAtomicVolatileUpdate:OFF',
+        '-Xep:OperatorPrecedence:OFF',
+        '-Xep:StringSplitter:OFF',
+        '-Xep:UnsynchronizedOverridesSynchronized:OFF',
+    ]
+}
+
+configurations.errorprone {
+    resolutionStrategy.force 'com.google.errorprone:error_prone_core:2.2.0'
+}

From 3c341b7e4b7eb307604407b34715bb7da909295d Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 13 Feb 2018 20:19:45 +0100
Subject: [PATCH 2/3] move errorprone config to its own gitlab CI job

---
 .gitlab-ci.yml           |  7 +++++++
 app/build.gradle         | 36 +-----------------------------------
 config/errorprone.gradle | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 35 deletions(-)
 create mode 100644 config/errorprone.gradle

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2861e66fb..66d7364db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,6 +45,13 @@ test:
     - ./gradlew test || export EXITVALUE=1
     - exit $EXITVALUE
 
+errorprone:
+  stage: test
+  script:
+    - cat config/errorprone.gradle >> app/build.gradle
+    - ./gradlew assembleDebug
+  allow_failure: true
+
 connected10:
   stage: test
   <<: *test-template
diff --git a/app/build.gradle b/app/build.gradle
index 027b25695..3c5dfb279 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -375,38 +375,4 @@ android.applicationVariants.all { variant ->
         exclude '**/BuildConfig.java'
         exclude '**/R.java'
     }
-}
-
-buildscript {
-    repositories {
-        maven {
-            url "https://plugins.gradle.org/m2/"
-        }
-    }
-    dependencies {
-        classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13"
-    }
-}
-
-apply plugin: "net.ltgt.errorprone"
-
-tasks.withType(JavaCompile) {
-    options.compilerArgs += [
-        '-Xep:CatchFail:OFF',
-        '-Xep:ClassCanBeStatic:OFF',
-        '-Xep:DateFormatConstant:OFF',
-        '-Xep:DefaultCharset:OFF',
-        '-Xep:FormatString:OFF',
-        '-Xep:JavaLangClash:OFF',
-        '-Xep:MissingCasesInEnumSwitch:OFF',
-        '-Xep:MissingOverride:OFF',
-        '-Xep:NonAtomicVolatileUpdate:OFF',
-        '-Xep:OperatorPrecedence:OFF',
-        '-Xep:StringSplitter:OFF',
-        '-Xep:UnsynchronizedOverridesSynchronized:OFF',
-    ]
-}
-
-configurations.errorprone {
-    resolutionStrategy.force 'com.google.errorprone:error_prone_core:2.2.0'
-}
+}
\ No newline at end of file
diff --git a/config/errorprone.gradle b/config/errorprone.gradle
new file mode 100644
index 000000000..067065bad
--- /dev/null
+++ b/config/errorprone.gradle
@@ -0,0 +1,34 @@
+
+buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath "net.ltgt.gradle:gradle-errorprone-plugin:0.0.13"
+    }
+}
+
+apply plugin: "net.ltgt.errorprone"
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs += [
+        '-Xep:CatchFail:OFF',
+        '-Xep:ClassCanBeStatic:OFF',
+        '-Xep:DateFormatConstant:OFF',
+        '-Xep:DefaultCharset:OFF',
+        '-Xep:FormatString:OFF',
+        '-Xep:JavaLangClash:OFF',
+        '-Xep:MissingCasesInEnumSwitch:OFF',
+        '-Xep:MissingOverride:OFF',
+        '-Xep:NonAtomicVolatileUpdate:OFF',
+        '-Xep:OperatorPrecedence:OFF',
+        '-Xep:StringSplitter:OFF',
+        '-Xep:UnsynchronizedOverridesSynchronized:OFF',
+    ]
+}
+
+configurations.errorprone {
+    resolutionStrategy.force 'com.google.errorprone:error_prone_core:2.2.0'
+}

From a4d35244bc85a3915edca77e672b6d2b42fd50d6 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 13 Feb 2018 20:20:02 +0100
Subject: [PATCH 3/3] errorprone: All Disabled Checks As Warnings

---
 config/errorprone.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/errorprone.gradle b/config/errorprone.gradle
index 067065bad..ea7d7fd1e 100644
--- a/config/errorprone.gradle
+++ b/config/errorprone.gradle
@@ -14,6 +14,7 @@ apply plugin: "net.ltgt.errorprone"
 
 tasks.withType(JavaCompile) {
     options.compilerArgs += [
+        '-XepAllDisabledChecksAsWarnings',
         '-Xep:CatchFail:OFF',
         '-Xep:ClassCanBeStatic:OFF',
         '-Xep:DateFormatConstant:OFF',