build: try to remove redundant guava dependency

WhiredPlanck · Jan 1, 2024 · 52b65e1 · 52b65e1
1 parent c9a86c2
commit 52b65e1
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 5 deletions.
diff --git a/buildSrc/build.gradle.kts → build-src/build.gradle.kts b/buildSrc/build.gradle.kts → build-src/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
 dependencies {
     compileOnly(libs.android.gradlePlugin)
     compileOnly(libs.kotlin.gradlePlugin)
-    implementation(libs.guava)
     implementation(libs.kotlinx.serialization.json)
 }
 

diff --git a/buildSrc/settings.gradle.kts → build-src/settings.gradle.kts b/buildSrc/settings.gradle.kts → build-src/settings.gradle.kts
diff --git a/...rc/src/main/kotlin/DataChecksumsPlugin.kt → ...rc/src/main/kotlin/DataChecksumsPlugin.kt b/...rc/src/main/kotlin/DataChecksumsPlugin.kt → ...rc/src/main/kotlin/DataChecksumsPlugin.kt
@@ -1,5 +1,3 @@
-import com.google.common.hash.Hashing
-import com.google.common.io.ByteSource
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
 import org.gradle.api.DefaultTask
@@ -18,6 +16,8 @@ import org.gradle.kotlin.dsl.task
 import org.gradle.work.ChangeType
 import org.gradle.work.Incremental
 import org.gradle.work.InputChanges
+import org.jetbrains.kotlin.com.google.common.hash.Hashing
+import org.jetbrains.kotlin.com.google.common.io.ByteSource
 import java.io.File
 import java.nio.charset.Charset
 import kotlin.collections.set

diff --git a/buildSrc/src/main/kotlin/Utils.kt → build-src/src/main/kotlin/Utils.kt b/buildSrc/src/main/kotlin/Utils.kt → build-src/src/main/kotlin/Utils.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,6 @@
 androidGradlePlugin = "8.2.0"
 kotlin = "1.9.20"
 ksp = "1.9.20-1.0.14"
-lifecycle = "2.6.2"
 navigation = "2.7.5"
 room = "2.6.1"
 splitties = "3.0.0"
@@ -27,7 +26,6 @@ androidx-room-runtime = { module = "androidx.room:room-runtime", version.ref = "
 androidx-room-ktx = { module = "androidx.room:room-ktx", version.ref = "room" }
 androidx-viewpager2 = { module = "androidx.viewpager2:viewpager2", version = "1.1.0-beta02" }
 flexbox = { module = "com.google.android.flexbox:flexbox", version = "3.0.0" }
-guava = { module = "com.google.guava:guava", version = "33.0.0-jre"}
 kaml = { module = "com.charleskorn.kaml:kaml", version = "0.56.0" }
 timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" }
 utilcode = { module = "com.blankj:utilcodex", version = "1.31.1" }

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,4 +1,5 @@
 pluginManagement {
+    includeBuild("build-src")
     repositories {
         gradlePluginPortal()
         google()