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

Jump to bottom

Use Guava version 33.1.0 #6546

Merged
merged 8 commits into from Apr 28, 2024
Merged

Use Guava version 33.1.0 #6546

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2d6f0f8
Use Guava version 33.1.0
mernst Apr 24, 2024
7f6af93
Depending on Guava requires the JSR 305 dependency too
mernst Apr 24, 2024
2094429
Merge branch 'master' into update-guava
mernst Apr 25, 2024
2a6dcaf
Merge ../checker-framework-branch-master into update-guava
mernst Apr 26, 2024
21b670e
Undo hack
mernst Apr 26, 2024
180f998
Merge ../checker-framework-branch-master into update-guava
mernst Apr 26, 2024
e440a88
Merge ../checker-framework-branch-master into update-guava
mernst Apr 27, 2024
fb32508
Update Guava version number
mernst Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion build.gradle
View file
Open in desktop
Expand Up @@ -753,10 +753,15 @@ subprojects {

// TODO: it's a bug that annotatedlib:guava requires the error_prone_annotations dependency.
annotatedGuava "com.google.errorprone:error_prone_annotations:${versions.errorprone}"
annotatedGuava ('org.checkerframework.annotatedlib:guava:30.1.1-jre') {
annotatedGuava ('org.checkerframework.annotatedlib:guava:33.1.0-jre') {
// So long as Guava only uses annotations from checker-qual, excluding it should not cause problems.
exclude group: 'org.checkerframework'
}
// Without this, running the Checker Framework leads to "class file for
// javax.annotation.meta.TypeQualifierDefault not found". I was not able to
// figure out how to use Gradle's exclusions (of transitive dependencies) in
// order to avoid the need for this.
annotatedGuava 'com.google.code.findbugs:jsr305:3.0.2'
Copy link
Member

Choose a reason for hiding this comment

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

This line is needed because the pom file in Maven central doesn't have Guava's dependencies. See: https://central.sonatype.com/artifact/org.checkerframework.annotatedlib/guava/dependencies

Compared to Google's version:
https://central.sonatype.com/artifact/com.google.guava/guava/dependencies

You'll need to release annotated Guava to fix this. (I'm also ok if you want to merge this work around.)

}

shadowJar {
Expand Down