From 59d26eec9440259c226da360202cbf26c5e4984a Mon Sep 17 00:00:00 2001
From: Open592 Developer <uss@open592.com>
Date: Wed, 25 Sep 2024 10:43:53 -0700
Subject: [PATCH] gradle: Force guava version without vulnerabilities

ref: https://github.com/google/guice/issues/1798

Signed-off-by: Open592 Developer <uss@open592.com>
---
 .idea/gradle.xml          | 3 +--
 build.gradle.kts          | 1 +
 gradle/libs.versions.toml | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 943b8a0..84e0be8 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,8 +5,7 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="" />
-        <option name="gradleJvm" value="17" />
+        <option name="gradleJvm" value="temurin-21" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/build.gradle.kts b/build.gradle.kts
index e56488a..9d3a3d1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,6 +24,7 @@ repositories {
 dependencies {
   implementation(libs.clikt)
   implementation(libs.guice)
+  implementation(libs.guava)
   implementation(libs.kotlin.inline.logger)
   runtimeOnly(libs.logback.classic)
   implementation(libs.netty.all)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8ea76d8..5952e40 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,7 @@
 [versions]
 clikt = "5.0.0"
+# https://github.com/google/guice/issues/1798
+guava = { strictly = "33.3.1-jre" }
 guice = "7.0.0"
 jimfs = "1.3.0"
 junit = "5.11.0"
@@ -16,6 +18,7 @@ ktfmt-gradle = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmt-gradle" }
 
 [libraries]
 clikt = { module = "com.github.ajalt.clikt:clikt", version.ref = "clikt" }
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
 guice = { module = "com.google.inject:guice", version.ref = "guice" }
 jimfs = { module = "com.google.jimfs:jimfs", version.ref = "jimfs" }
 junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }