diff --git a/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/StrictUnusedVariable.java b/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/StrictUnusedVariable.java index 34529a11b..25b34175b 100644 --- a/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/StrictUnusedVariable.java +++ b/baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/StrictUnusedVariable.java @@ -679,7 +679,7 @@ private VariableFinder(VisitorState state) { @Override @SuppressWarnings("SwitchStatementDefaultCase") public Void visitVariable(VariableTree variableTree, Void unused) { - if (isSuppressed(variableTree)) { + if (isSuppressed(variableTree, state)) { return null; } Symbol.VarSymbol symbol = getSymbol(variableTree); @@ -757,7 +757,7 @@ public Void visitTry(TryTree node, Void unused) { @Override public Void visitClass(ClassTree tree, Void unused) { - if (isSuppressed(tree)) { + if (isSuppressed(tree, state)) { return null; } if (EXEMPTING_SUPER_TYPES.stream() @@ -777,7 +777,7 @@ public Void visitLambdaExpression(LambdaExpressionTree node, Void unused) { @Override public Void visitMethod(MethodTree tree, Void unused) { - return isSuppressed(tree) ? null : super.visitMethod(tree, unused); + return isSuppressed(tree, state) ? null : super.visitMethod(tree, unused); } } diff --git a/changelog/@unreleased/pr-2203.v2.yml b/changelog/@unreleased/pr-2203.v2.yml new file mode 100644 index 000000000..6d6ce2ed4 --- /dev/null +++ b/changelog/@unreleased/pr-2203.v2.yml @@ -0,0 +1,8 @@ +type: improvement +improvement: + description: |- + Upgrade error-prone to 2.13.1 (from 2.12.1) + + Use non-deprecated isSuppressed methods + links: + - https://github.com/palantir/gradle-baseline/pull/2203 diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java index 5ba3289a8..623f604d5 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java @@ -62,7 +62,6 @@ public class BaselineErrorProneExtension { "PreferSafeLoggingPreconditions", "PreferStaticLoggers", "ProxyNonConstantType", - "PublicConstructorForAbstractClass", "ReadReturnValueIgnored", "RedundantMethodReference", "RedundantModifier", diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java index fd7988410..904088de0 100644 --- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java +++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java @@ -148,7 +148,6 @@ private static void applyToJavaProject(Project project) { errorProneOptions.check("PreferSafeLogger", CheckSeverity.OFF); errorProneOptions.check("PreferSafeLoggingPreconditions", CheckSeverity.OFF); errorProneOptions.check("PreconditionsConstantMessage", CheckSeverity.OFF); - errorProneOptions.check("PublicConstructorForAbstractClass", CheckSeverity.OFF); })); }); } diff --git a/versions.lock b/versions.lock index 59d9ce1c0..09a13d296 100644 --- a/versions.lock +++ b/versions.lock @@ -18,13 +18,13 @@ com.google.auto.service:auto-service-annotations:1.0.1 (3 constraints: 2a3379a0) com.google.auto.value:auto-value:1.7.4 (1 constraints: 1f1221fb) com.google.auto.value:auto-value-annotations:1.9 (3 constraints: 802d5ac8) com.google.code.findbugs:jsr305:3.0.2 (6 constraints: 66626968) -com.google.errorprone:error_prone_annotation:2.12.1 (3 constraints: be3840ec) -com.google.errorprone:error_prone_annotations:2.12.1 (12 constraints: 7ebd4d88) -com.google.errorprone:error_prone_check_api:2.12.1 (2 constraints: ae2596fe) -com.google.errorprone:error_prone_core:2.12.1 (2 constraints: 0d185966) -com.google.errorprone:error_prone_refaster:2.12.1 (1 constraints: 3805363b) -com.google.errorprone:error_prone_test_helpers:2.12.1 (1 constraints: 3805363b) -com.google.errorprone:error_prone_type_annotations:2.12.1 (1 constraints: 231149c9) +com.google.errorprone:error_prone_annotation:2.13.1 (3 constraints: c138e9ec) +com.google.errorprone:error_prone_annotations:2.13.1 (12 constraints: 81bdf58c) +com.google.errorprone:error_prone_check_api:2.13.1 (2 constraints: b025d4fe) +com.google.errorprone:error_prone_core:2.13.1 (2 constraints: 0f189366) +com.google.errorprone:error_prone_refaster:2.13.1 (1 constraints: 3905393b) +com.google.errorprone:error_prone_test_helpers:2.13.1 (1 constraints: 3905393b) +com.google.errorprone:error_prone_type_annotations:2.13.1 (1 constraints: 24114cc9) com.google.googlejavaformat:google-java-format:1.13.0 (1 constraints: 8b149d75) com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4) com.google.guava:guava:31.1-jre (12 constraints: e1ce71e6) diff --git a/versions.props b/versions.props index fb6261577..2381734fb 100644 --- a/versions.props +++ b/versions.props @@ -1,7 +1,7 @@ com.diffplug.spotless:spotless-plugin-gradle = 6.4.2 com.fasterxml.jackson.core:jackson-databind = 2.13.2.1 com.google.auto.service:auto-service = 1.0.1 -com.google.errorprone:error_prone_* = 2.12.1 +com.google.errorprone:error_prone_* = 2.13.1 com.google.guava:guava = 31.1-jre com.palantir.safe-logging:* = 1.26.0 commons-lang:commons-lang = 2.6