From d4b6a58286638e4eb734906efe45d5b7ea86337d Mon Sep 17 00:00:00 2001
From: David Schlosnagle <davids@palantir.com>
Date: Mon, 12 Sep 2022 10:39:51 -0400
Subject: [PATCH] Rely on gradle-baseline provided error-prone

---
 build.gradle   | 6 +-----
 versions.lock  | 2 +-
 versions.props | 1 -
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4b3434176..344854c64 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,6 @@ buildscript {
     dependencies {
         classpath 'com.palantir.gradle.jdks:gradle-jdks:0.27.0'
         classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.4.0'
-        classpath 'com.google.errorprone:error_prone_core:2.14.0'
         classpath 'com.palantir.baseline:gradle-baseline-java:4.161.0'
         classpath 'com.palantir.gradle.consistentversions:gradle-consistent-versions:2.11.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.11.0'
@@ -68,6 +67,7 @@ allprojects {
             options.errorprone {
                 option('NullAway:AnnotatedPackages', 'com.palantir')
                 option('NullAway:CheckOptionalEmptiness', 'true')
+                option('AllSuggestionsAsWarnings') // https://github.com/google/error-prone/pull/3301
 
                 // warnings not explicitly provided by error-prone
                 error 'NullAway',
@@ -78,10 +78,6 @@ allprojects {
                         'PreferSafeLoggableExceptions',
                         'PreferSafeLogger'
 
-                // increase strictness for built-in error-prone checks
-                error((com.google.errorprone.scanner.BuiltInCheckerSuppliers.ENABLED_WARNINGS +
-                        com.google.errorprone.scanner.BuiltInCheckerSuppliers.DISABLED_CHECKS
-                        ).collect { it.canonicalName() } as String[])
 
                 disable 'AndroidJdkLibsChecker', // ignore Android
                         'Java7ApiChecker', // tritium requires JDK 11+
diff --git a/versions.lock b/versions.lock
index 94596894a..f8e406d66 100644
--- a/versions.lock
+++ b/versions.lock
@@ -2,7 +2,7 @@
 com.github.ben-manes.caffeine:caffeine:3.1.1 (1 constraints: 0705fe35)
 com.google.auto.service:auto-service-annotations:1.0.1 (1 constraints: 0405f135)
 com.google.code.findbugs:jsr305:3.0.2 (4 constraints: 5c3586ed)
-com.google.errorprone:error_prone_annotations:2.14.0 (9 constraints: 1376d655)
+com.google.errorprone:error_prone_annotations:2.14.0 (8 constraints: dc70754c)
 com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4)
 com.google.guava:guava:31.1-jre (5 constraints: 6b423e36)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
diff --git a/versions.props b/versions.props
index 017edf744..3a39dfcd4 100644
--- a/versions.props
+++ b/versions.props
@@ -4,7 +4,6 @@ com.github.ben-manes.caffeine:caffeine = 3.1.1
 com.google.auto:* = 1.2.1
 com.google.auto.service:* = 1.0.1
 com.google.code.findbugs:jsr305 = 3.0.2
-com.google.errorprone:* = 2.12.1
 com.google.guava:guava = 31.1-jre
 com.google.testing.compile:compile-testing = 0.19
 com.palantir.goethe:* = 0.8.0