From fae1aecb466b1eab033ab3f20fe0a490d464458c Mon Sep 17 00:00:00 2001
From: Akash Yadav <itsaky01@gmail.com>
Date: Fri, 20 Oct 2023 19:48:55 +0530
Subject: [PATCH] fix: replace usage of guava-jre with guava-android

---
 gradle/libs.versions.toml                       | 1 -
 lsp/java/build.gradle.kts                       | 2 +-
 subprojects/google-java-format/build.gradle.kts | 2 +-
 subprojects/layoutlib-api/build.gradle.kts      | 2 +-
 subprojects/xml-dom/build.gradle.kts            | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0b615a24a..8d4e27845 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -76,7 +76,6 @@ androidx-work-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "
 google-material = { module = "com.google.android.material:material", version = "1.9.0" }
 google-gson = { module = "com.google.code.gson:gson", version = "2.10.1" }
 google-guava = { module = "com.google.guava:guava", version = "31.1-android" }
-google-guava-jre = { module = "com.google.guava:guava", version = "31.1-jre" }
 google-auto-value-annotations = { module = "com.google.auto.value:auto-value-annotations", version = "1.10.4" }
 google-auto-value-ap = { module = "com.google.auto.value:auto-value", version = "1.10.4" }
 google-auto-service-annotations = { module = "com.google.auto.service:auto-service-annotations", version = "1.1.1" }
diff --git a/lsp/java/build.gradle.kts b/lsp/java/build.gradle.kts
index 91a6b238a..02156b5bc 100644
--- a/lsp/java/build.gradle.kts
+++ b/lsp/java/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
     implementation(libs.common.javaparser)
     implementation(libs.common.utilcode)
     implementation(libs.androidx.annotation)
-    implementation(libs.google.guava.jre)
+    implementation(libs.google.guava)
     implementation(libs.google.gson)
     
     compileOnly(libs.androidx.appcompat)
diff --git a/subprojects/google-java-format/build.gradle.kts b/subprojects/google-java-format/build.gradle.kts
index dbd68db8b..63791dd77 100644
--- a/subprojects/google-java-format/build.gradle.kts
+++ b/subprojects/google-java-format/build.gradle.kts
@@ -21,7 +21,7 @@ plugins {
 }
 
 dependencies {
-    implementation(libs.google.guava.jre)
+    implementation(libs.google.guava)
     implementation(libs.google.auto.value.annotations)
     implementation(projects.subprojects.javac)
     
diff --git a/subprojects/layoutlib-api/build.gradle.kts b/subprojects/layoutlib-api/build.gradle.kts
index bbe721ef8..b774e02f2 100644
--- a/subprojects/layoutlib-api/build.gradle.kts
+++ b/subprojects/layoutlib-api/build.gradle.kts
@@ -35,7 +35,7 @@ dependencies {
     implementation(libs.aapt2.annotations)
     implementation(libs.aapt2.jb.annotations)
     
-    implementation(libs.google.guava.jre)
+    implementation(libs.google.guava)
     
     testImplementation(libs.tests.junit)
     testImplementation(libs.tests.google.truth)
diff --git a/subprojects/xml-dom/build.gradle.kts b/subprojects/xml-dom/build.gradle.kts
index 2a66e8580..1c1267e0f 100644
--- a/subprojects/xml-dom/build.gradle.kts
+++ b/subprojects/xml-dom/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
     
     implementation(libs.common.jsoup)
     implementation(libs.common.jsonrpc)
-    implementation(libs.google.guava.jre)
+    implementation(libs.google.guava)
     implementation(libs.google.gson)
     implementation(libs.xml.remark)
     implementation(libs.xml.resolver)