Skip to content

Commit

Permalink
chore(deps): bump com.google.guava:guava from 32.0.1-jre to 32.1.2-jre (
Browse files Browse the repository at this point in the history
#4078)

* chore(deps): bump com.google.guava:guava from 32.0.1-jre to 32.1.2-jre

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.0.1-jre to 32.1.2-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* add workaround for gradle 6 and guava metadata

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alice <65933803+alicejli@users.noreply.github.com>
Co-authored-by: Alice Li <alicejli@google.com>
  • Loading branch information
3 people authored Sep 6, 2023
1 parent a865c76 commit 0766506
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ project.ext.dependencyStrings = [
GOOGLE_HTTP_CLIENT: 'com.google.http-client:google-http-client:1.42.2',
GOOGLE_HTTP_CLIENT_APACHE_V2: 'com.google.http-client:google-http-client-apache-v2:1.42.2',
GOOGLE_AUTH_LIBRARY_OAUTH2_HTTP: 'com.google.auth:google-auth-library-oauth2-http:1.10.0',
GUAVA: 'com.google.guava:guava:32.0.1-jre',
GUAVA: 'com.google.guava:guava:32.1.2-jre',
JSR305: 'com.google.code.findbugs:jsr305:3.0.2', // transitively pulled in by GUAVA

// for Build Plan and Jib Plugins Extension API
Expand Down Expand Up @@ -79,6 +79,16 @@ subprojects {
apply plugin: 'net.ltgt.errorprone'
apply plugin: 'jacoco'

// Guava update breaks unit tests. Workaround mentioned in https://github.com/google/guava/issues/6612#issuecomment-1614992368.
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")
}
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
compileJava.options.encoding = 'UTF-8'
Expand Down

0 comments on commit 0766506

Please sign in to comment.