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 the latest release #2651

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Upgrade error-prone to the latest release #2651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47dc3af
Upgrade error-prone to the latest release
carterkozak Oct 23, 2023
a35b4ae
Add generated changelog entries
svc-changelog Oct 23, 2023
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
1 change: 1 addition & 0 deletions baseline-error-prone/baseline-class-uniqueness.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
## runtimeClasspath
[io.github.eisop:dataflow-errorprone, org.checkerframework:checker-qual]
- org.checkerframework.dataflow.qual.Deterministic
- org.checkerframework.dataflow.qual.Impure
- org.checkerframework.dataflow.qual.Pure
- org.checkerframework.dataflow.qual.Pure$Kind
- org.checkerframework.dataflow.qual.SideEffectFree
Expand Down
3 changes: 1 addition & 2 deletions baseline-error-prone/src/main/java/com/palantir/baseline/errorprone/LogsafeArgName.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ public LogsafeArgName() {

@Inject
public LogsafeArgName(ErrorProneFlags flags) {
this.unsafeParamNames =
flags.getList(UNSAFE_ARG_NAMES_FLAG).map(ImmutableSet::copyOf).orElseGet(ImmutableSet::of);
this.unsafeParamNames = ImmutableSet.copyOf(flags.getListOrEmpty(UNSAFE_ARG_NAMES_FLAG));
}

@Override
Expand Down
1 change: 1 addition & 0 deletions baseline-null-away/baseline-class-uniqueness.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
## runtimeClasspath
[org.checkerframework:checker-qual, org.checkerframework:dataflow-nullaway]
- org.checkerframework.dataflow.qual.Deterministic
- org.checkerframework.dataflow.qual.Impure
- org.checkerframework.dataflow.qual.Pure
- org.checkerframework.dataflow.qual.Pure$Kind
- org.checkerframework.dataflow.qual.SideEffectFree
Expand Down
3 changes: 3 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ allprojects {
tasks.withType(JavaCompile) {
options.compilerArgs += ['-Werror', '-Xlint:deprecation']
options.errorprone {
// errorprone must be temporarily disabled in order to bump the errorprone dependency
// to a version without `ErrorProneFlags.getList(String)`.
enabled = false
Comment on lines +50 to +52
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've verified that this can be safely removed after the meta-baseline-upgrade by compiling the project without this block using a publishToMavenLocal.

check("Slf4jLogsafeArgs", CheckSeverity.OFF)
check("PreferSafeLoggableExceptions", CheckSeverity.OFF)
check("PreferSafeLogger", CheckSeverity.OFF)
Expand Down
5 changes: 5 additions & 0 deletions changelog/@unreleased/pr-2651.v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type: improvement
improvement:
description: Upgrade error-prone to the latest release
links:
- https://github.com/palantir/gradle-baseline/pull/2651
24 changes: 12 additions & 12 deletions versions.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +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.9 (3 constraints: 802d5ac8)
com.google.code.findbugs:jsr305:3.0.2 (6 constraints: 66626968)
com.google.errorprone:error_prone_annotation:2.21.1 (3 constraints: be3843ec)
com.google.errorprone:error_prone_annotations:2.21.1 (12 constraints: aebde2ad)
com.google.errorprone:error_prone_check_api:2.21.1 (2 constraints: ae2598fe)
com.google.errorprone:error_prone_core:2.21.1 (1 constraints: 3805373b)
com.google.errorprone:error_prone_type_annotations:2.21.1 (1 constraints: 23114ac9)
com.google.errorprone:error_prone_annotation:2.23.0 (3 constraints: c138f2ec)
com.google.errorprone:error_prone_annotations:2.23.0 (12 constraints: b1bd90b2)
com.google.errorprone:error_prone_check_api:2.23.0 (2 constraints: b025dafe)
com.google.errorprone:error_prone_core:2.23.0 (1 constraints: 39053c3b)
com.google.errorprone:error_prone_type_annotations:2.23.0 (1 constraints: 24114fc9)
com.google.guava:failureaccess:1.0.1 (2 constraints: f1150513)
com.google.guava:guava:32.1.2-jre (15 constraints: 18f6510c)
com.google.guava:guava:32.1.2-jre (15 constraints: b6f5d02c)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918)
com.google.inject:guice:5.1.0 (2 constraints: c21eb8b6)
com.google.j2objc:j2objc-annotations:2.8 (1 constraints: be09f5a0)
Expand All @@ -30,11 +30,11 @@ com.googlecode.javaewah:JavaEWAH:1.1.12 (1 constraints: 750eee5e)
com.palantir.gradle.utils:lazily-configured-mapping:0.1.0 (1 constraints: 0305ee35)
com.palantir.javaformat:gradle-palantir-java-format:1.1.0 (1 constraints: 0405f335)
com.palantir.javaformat:palantir-java-format-spi:1.1.0 (1 constraints: 711560be)
com.uber.nullaway:nullaway:0.10.12 (1 constraints: 66058a40)
com.uber.nullaway:nullaway:0.10.15 (1 constraints: 69058d40)
commons-io:commons-io:2.13.0 (2 constraints: f519f007)
commons-lang:commons-lang:2.6 (1 constraints: ac04232c)
io.github.eisop:dataflow-errorprone:3.34.0-eisop1 (3 constraints: 444080e0)
io.github.java-diff-utils:java-diff-utils:4.0 (1 constraints: 811205f6)
io.github.java-diff-utils:java-diff-utils:4.12 (1 constraints: b412c908)
javax.annotation:javax.annotation-api:1.3.2 (2 constraints: cd204f35)
javax.inject:javax.inject:1 (9 constraints: e5867a2e)
net.ltgt.gradle:gradle-errorprone-plugin:3.1.0 (1 constraints: 0605fd35)
Expand All @@ -56,8 +56,8 @@ org.apache.maven.resolver:maven-resolver-spi:1.9.7 (3 constraints: 6e306f6a)
org.apache.maven.resolver:maven-resolver-util:1.9.7 (3 constraints: 6e306f6a)
org.apache.maven.shared:maven-dependency-analyzer:1.13.2 (1 constraints: 3905343b)
org.apache.maven.shared:maven-shared-utils:3.3.4 (1 constraints: e60b61f3)
org.checkerframework:checker-qual:3.33.0 (3 constraints: 0725c187)
org.checkerframework:dataflow-nullaway:3.33.0 (2 constraints: 6a1198f1)
org.checkerframework:checker-qual:3.39.0 (3 constraints: 0725c187)
org.checkerframework:dataflow-nullaway:3.39.0 (2 constraints: 6e11a5f1)
org.codehaus.groovy:groovy:3.0.10 (3 constraints: e32879d6)
org.codehaus.groovy:groovy-xml:3.0.10 (1 constraints: 791161da)
org.codehaus.plexus:plexus-cipher:2.0 (1 constraints: 641174c7)
Expand All @@ -66,7 +66,7 @@ org.codehaus.plexus:plexus-component-annotations:2.1.0 (2 constraints: 241d860a)
org.codehaus.plexus:plexus-interpolation:1.26 (3 constraints: 7b2bf0f5)
org.codehaus.plexus:plexus-sec-dispatcher:2.0 (1 constraints: 5c100b99)
org.codehaus.plexus:plexus-utils:3.5.1 (11 constraints: 3fa89966)
org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r (3 constraints: a43f6e15)
org.eclipse.jgit:org.eclipse.jgit:5.13.0.202109080827-r (2 constraints: 562b9625)
org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5 (3 constraints: 852caa93)
org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5 (2 constraints: 141abc34)
org.immutables:value:2.9.3 (1 constraints: 10051336)
Expand All @@ -83,7 +83,7 @@ com.fasterxml.jackson.core:jackson-databind:2.15.2 (5 constraints: b04a5461)
com.fasterxml.jackson.module:jackson-module-afterburner:2.15.2 (1 constraints: 3c05403b)
com.github.stefanbirkner:system-rules:1.19.0 (1 constraints: 3d05443b)
com.google.auto.value:auto-value:1.7.4 (1 constraints: 1f1221fb)
com.google.errorprone:error_prone_test_helpers:2.21.1 (1 constraints: 3805373b)
com.google.errorprone:error_prone_test_helpers:2.23.0 (1 constraints: 39053c3b)
com.google.googlejavaformat:google-java-format:1.13.0 (1 constraints: 8b149d75)
com.google.jimfs:jimfs:1.2 (1 constraints: fb138b38)
com.google.testing.compile:compile-testing:0.19 (1 constraints: 3214b94c)
Expand Down
4 changes: 2 additions & 2 deletions versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ org.jooq:jooq = 3.18.6
org.slf4j:* = 1.7.36
org.immutables:* = 2.9.3
org.ow2.asm:asm = 9.5
com.google.errorprone:error_prone_* = 2.21.1
com.google.errorprone:error_prone_* = 2.23.0
com.googlecode.java-diff-utils:diffutils = 1.3.0
com.puppycrawl.tools:checkstyle = 10.12.2
com.palantir.gradle.utils:* = 0.1.0
com.uber.nullaway:nullaway = 0.10.12
com.uber.nullaway:nullaway = 0.10.15

# test deps
com.fasterxml.jackson.*:* = 2.15.2
Expand Down