Update Guava to version 32.1.2
Only for --new-gradle setup, as there are issues with Guava 32.1.2 and
Gradle 6.
Fixes: b/295485262
Change-Id: Ia4b3457f9bf486a3e9adc4f8d798322745f776b1
diff --git a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
index 2f7b4b7..5f11f3a 100644
--- a/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
+++ b/d8_r8/commonBuildSrc/src/main/kotlin/DependenciesPlugin.kt
@@ -293,7 +293,7 @@
const val errorproneVersion = "2.18.0"
const val fastUtilVersion = "7.2.1"
const val gsonVersion = "2.10.1"
- const val guavaVersion = "31.1-jre"
+ const val guavaVersion = "32.1.2-jre"
const val javassist = "3.29.2-GA"
const val junitVersion = "4.13-beta-2"
const val kotlinVersion = "1.8.10"
diff --git a/third_party/dependencies_new.tar.gz.sha1 b/third_party/dependencies_new.tar.gz.sha1
index e7d9678..06a0844 100644
--- a/third_party/dependencies_new.tar.gz.sha1
+++ b/third_party/dependencies_new.tar.gz.sha1
@@ -1 +1 @@
-197067233a81d8fa441a320c4cad287fa5a3eeb3
\ No newline at end of file
+6b9cdd6a300430a714493fc4a7673db43cea5faa
\ No newline at end of file
diff --git a/tools/create_local_maven_with_dependencies.py b/tools/create_local_maven_with_dependencies.py
index a94695e..3afa029 100755
--- a/tools/create_local_maven_with_dependencies.py
+++ b/tools/create_local_maven_with_dependencies.py
@@ -24,6 +24,7 @@
KOTLIN_METADATA_VERSION = '0.6.2'
KOTLIN_VERSION = '1.8.0'
GUAVA_VERSION = '31.1-jre'
+GUAVA_VERSION_NEW = '32.1.2-jre'
GSON_VERSION = '2.10.1'
JAVASSIST_VERSION = '3.29.2-GA'
JUNIT_VERSION = '4.13-beta-2'
@@ -61,6 +62,7 @@
]
NEW_DEPENDENCIES = [
+ 'com.google.guava:guava:{version}'.format(version = GUAVA_VERSION_NEW),
'org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.0.6',
'org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.10',
'org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.10',
