Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade error-prone to 2.13.1 (from 2.12.1) #2203

Merged
merged 4 commits into from
Apr 18, 2022
Merged

Upgrade error-prone to 2.13.1 (from 2.12.1) #2203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7318d4
Upgrade error-prone to 2.13.1 (from 2.12.1)
schlosna Apr 18, 2022
c9368fb
Use non-deprecated isSuppressed methods
schlosna Apr 18, 2022
0d9de64
Add generated changelog entries
svc-changelog Apr 18, 2022
d0e6543
Remove references to obsolete PublicConstructorForAbstractClass check
schlosna Apr 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...line-error-prone/src/main/java/com/palantir/baseline/errorprone/StrictUnusedVariable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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()
Expand All @@ -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);
}
}

Expand Down
8 changes: 8 additions & 0 deletions changelog/@unreleased/pr-2203.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion ...ne-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ public class BaselineErrorProneExtension {
"PreferSafeLoggingPreconditions",
"PreferStaticLoggers",
"ProxyNonConstantType",
"PublicConstructorForAbstractClass",
"ReadReturnValueIgnored",
"RedundantMethodReference",
"RedundantModifier",
Expand Down
1 change: 0 additions & 1 deletion gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/BaselineErrorProne.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}));
});
}
Expand Down
14 changes: 7 additions & 7 deletions versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down