Fix compatibility with error-prone 2.38.0

baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/DangerousIdentityKey.java

@@ -64,7 +64,7 @@ private static boolean implementsMethod(Types types, Type type, Name methodName,
         MethodSymbol equals =
                 (MethodSymbol) state.getSymtab().objectType.tsym.members().findFirst(methodName);
 
-        return !Iterables.isEmpty(ASTHelpers.scope(types.membersClosure(type, false))
+        return !Iterables.isEmpty(types.membersClosure(type, false)
                 .getSymbolsByName(methodName, m -> m != equals && m.overrides(equals, type.tsym, types, false)));
     }
 }

baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/ExecutorSubmitRunnableFutureIgnored.java

@@ -18,9 +18,11 @@
 
 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
+import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.AbstractReturnValueIgnored;
 import com.google.errorprone.bugpatterns.BugChecker;
+import com.google.errorprone.bugpatterns.threadsafety.ConstantExpressions;
 import com.google.errorprone.fixes.SuggestedFixes;
 import com.google.errorprone.matchers.Description;
 import com.google.errorprone.matchers.Matcher;
@@ -45,6 +47,10 @@ public final class ExecutorSubmitRunnableFutureIgnored extends AbstractReturnVal
             .named("submit")
             .withParameters(Runnable.class.getName());
 
+    public ExecutorSubmitRunnableFutureIgnored() {
+        super(ConstantExpressions.fromFlags(ErrorProneFlags.empty()));
+    }
+
     @Override
     public Matcher<? super ExpressionTree> specializedMatcher() {
         return MATCHER;

baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/IllegalSafeLoggingArgument.java

@@ -26,7 +26,7 @@
 import com.google.errorprone.matchers.Matcher;
 import com.google.errorprone.matchers.method.MethodMatchers;
 import com.google.errorprone.util.ASTHelpers;
-import com.google.errorprone.util.ASTHelpers.TargetType;
+import com.google.errorprone.util.TargetType;
 import com.palantir.baseline.errorprone.safety.Safety;
 import com.palantir.baseline.errorprone.safety.SafetyAnalysis;
 import com.palantir.baseline.errorprone.safety.SafetyAnnotations;
@@ -493,7 +493,7 @@ public Description matchLambdaExpression(LambdaExpressionTree tree, VisitorState
     }
 
     private Safety getLambdaRequiredReturnSafety(LambdaExpressionTree tree, VisitorState state) {
-        TargetType returnType = ASTHelpers.targetType(state.withPath(new TreePath(state.getPath(), tree)));
+        TargetType returnType = TargetType.targetType(state.withPath(new TreePath(state.getPath(), tree)));
         if (returnType == null) {
             return Safety.UNKNOWN;
         }

baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/ReadReturnValueIgnored.java

@@ -21,9 +21,11 @@
 import com.google.common.io.ByteStreams;
 import com.google.common.io.CharStreams;
 import com.google.errorprone.BugPattern;
+import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.AbstractReturnValueIgnored;
 import com.google.errorprone.bugpatterns.BugChecker;
+import com.google.errorprone.bugpatterns.threadsafety.ConstantExpressions;
 import com.google.errorprone.fixes.SuggestedFix;
 import com.google.errorprone.fixes.SuggestedFixes;
 import com.google.errorprone.matchers.Description;
@@ -48,6 +50,10 @@
                 + "of bytes have been consumed.")
 public final class ReadReturnValueIgnored extends AbstractReturnValueIgnored {
 
+    public ReadReturnValueIgnored() {
+        super(ConstantExpressions.fromFlags(ErrorProneFlags.empty()));
+    }
+
     // MethodMatchers does not support matching arrays
     private static final Matcher<ExpressionTree> INPUT_STREAM_BUFFER_READ_MATCHER = Matchers.allOf(
             MethodMatchers.instanceMethod()

baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/UnsafeGaugeRegistration.java

@@ -18,9 +18,11 @@
 
 import com.google.auto.service.AutoService;
 import com.google.errorprone.BugPattern;
+import com.google.errorprone.ErrorProneFlags;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.AbstractReturnValueIgnored;
 import com.google.errorprone.bugpatterns.BugChecker;
+import com.google.errorprone.bugpatterns.threadsafety.ConstantExpressions;
 import com.google.errorprone.fixes.SuggestedFixes;
 import com.google.errorprone.matchers.Description;
 import com.google.errorprone.matchers.Matcher;
@@ -54,6 +56,10 @@ public final class UnsafeGaugeRegistration extends AbstractReturnValueIgnored {
     private static final Supplier<Symbol> TAGGED_METRIC_REGISTRY =
             VisitorState.memoize(state -> state.getSymbolFromString(TAGGED_REGISTRY));
 
+    public UnsafeGaugeRegistration() {
+        super(ConstantExpressions.fromFlags(ErrorProneFlags.empty()));
+    }
+
     @Override
     public Matcher<? super ExpressionTree> specializedMatcher() {
         return MATCHER;

build.gradle

@@ -50,6 +50,10 @@ allprojects {
         tasks.withType(JavaCompile) {
             options.compilerArgs += ['-Werror', '-Xlint:deprecation']
             options.errorprone {
+                // Temporarily disable errorprone, because it cannot pass due to the issue that is being fixed
+                // in #3101. Remove this line after a new version has been released.
+                getDisableAllChecks().set(true)
+
                 disable("Slf4jLogsafeArgs")
                 disable("PreferSafeLoggableExceptions")
                 disable("PreferSafeLogger")

versions.lock

@@ -13,14 +13,13 @@ com.google.auto.service:auto-service:1.1.1 (1 constraints: 0505f435)
 com.google.auto.service:auto-service-annotations:1.1.1 (2 constraints: 8a20341c)
 com.google.auto.value:auto-value-annotations:1.10.4 (3 constraints: ac2df2f5)
 com.google.code.findbugs:jsr305:3.0.2 (2 constraints: 9e14e59e)
-com.google.errorprone:error_prone_annotation:2.36.0 (3 constraints: cd3899ef)
-com.google.errorprone:error_prone_annotations:2.36.0 (13 constraints: 81cdd84b)
-com.google.errorprone:error_prone_check_api:2.36.0 (2 constraints: b825d4ff)
-com.google.errorprone:error_prone_core:2.36.0 (1 constraints: 38053a3b)
-com.google.errorprone:error_prone_type_annotations:2.36.0 (1 constraints: 28115cc9)
-com.google.googlejavaformat:google-java-format:1.19.1 (2 constraints: ba251300)
+com.google.errorprone:error_prone_annotation:2.38.0 (3 constraints: d338ebf0)
+com.google.errorprone:error_prone_annotations:2.38.0 (13 constraints: 87cd3c56)
+com.google.errorprone:error_prone_check_api:2.38.0 (2 constraints: bc255f00)
+com.google.errorprone:error_prone_core:2.38.0 (1 constraints: 3f054f3b)
+com.google.googlejavaformat:google-java-format:1.24.0 (2 constraints: b025d4fe)
 com.google.guava:failureaccess:1.0.3 (2 constraints: f3154f13)
-com.google.guava:guava:33.4.8-jre (20 constraints: 056ce29d)
+com.google.guava:guava:33.4.8-jre (20 constraints: 176cced4)
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
 com.google.inject:guice:5.1.0 (1 constraints: e20b61f3)
 com.google.j2objc:j2objc-annotations:3.0.0 (1 constraints: 150aeab4)
@@ -90,7 +89,7 @@ com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.3 (1 constraints: ea13
 com.fasterxml.jackson.module:jackson-module-afterburner:2.18.3 (1 constraints: 40054a3b)
 com.github.stefanbirkner:system-rules:1.19.0 (1 constraints: 3d05443b)
 com.google.auto.value:auto-value:1.10 (1 constraints: e711f8e8)
-com.google.errorprone:error_prone_test_helpers:2.36.0 (1 constraints: 38053a3b)
+com.google.errorprone:error_prone_test_helpers:2.38.0 (1 constraints: 3f054f3b)
 com.google.jimfs:jimfs:1.3.0 (1 constraints: 5a141061)
 com.google.testing.compile:compile-testing:0.21.0 (1 constraints: 89149575)
 com.google.truth:truth:1.4.0 (2 constraints: 72265a6a)

versions.props

@@ -14,7 +14,7 @@ org.slf4j:* = 1.7.36
 org.immutables:* = 2.10.1
 org.ow2.asm:asm = 9.8
 com.google.code.findbugs:jsr305 = 3.0.2
-com.google.errorprone:error_prone_* = 2.31.0
+com.google.errorprone:error_prone_* = 2.38.0
 com.googlecode.java-diff-utils:diffutils = 1.3.0
 com.puppycrawl.tools:checkstyle = 10.23.1
 com.palantir.gradle.utils:* = 0.10.0