diff --git a/build.gradle b/build.gradle index 8cb2881a55..0d07e8a81c 100644 --- a/build.gradle +++ b/build.gradle @@ -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 @@ -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'