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.

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

Update to Guava 32.1.1 #184

Merged
merged 1 commit into from
Jul 27, 2023
Merged
Changes from all commits
Commits
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
15 changes: 14 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ repositories {

dependencies {
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.15.0'
implementation group: 'com.google.guava', name: 'guava', version:'31.1-jre'
implementation (group: 'com.google.guava', name: 'guava', version:'32.1.1-jre') {
// needed due to https://github.com/google/guava/issues/6654
exclude group: "org.mockito", module: "mockito-core"
}
testImplementation group: 'junit', name: 'junit', version:'4.13.1'
testImplementation group: 'org.mockito', name: 'mockito-core', version:'1.10.19'
testImplementation group: 'org.hamcrest', name: 'hamcrest-library', version:'1.3'
Expand All @@ -75,3 +78,13 @@ task exportVersion() {
new File(rootDir, "version.txt").text = "$version"
}
}

// See https://github.com/google/guava/releases/tag/v32.1.0 for why this is required
sourceSets.all {
configurations.getByName(runtimeClasspathConfigurationName) {
attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
}
configurations.getByName(compileClasspathConfigurationName) {
attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
}
}