updated build files to fix build issues

- updated deps
nisrulz · Mar 12, 2024 · 597fd0c · 597fd0c
1 parent 5da8c6b
commit 597fd0c
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 17 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -17,4 +17,15 @@ android {
 dependencies {
     // Module Dependency
     implementation(projects.presentation)
+
+    /**
+     * @TODO: Remove this workaround when below issues are solved with AGP 8.3.0
+     * https://github.com/google/guava/issues/6618
+     * https://github.com/android/nowinandroid/pull/1140#issuecomment-1979431658
+     */
+    modules {
+        module("com.google.guava:listenablefuture") {
+            replacedBy("com.google.guava:guava", "listenablefuture is part of guava")
+        }
+    }
 }
diff --git a/build-logic/src/main/kotlin/hilt-convention.gradle.kts b/build-logic/src/main/kotlin/hilt-convention.gradle.kts
@@ -1,4 +1,4 @@
-import gradle.kotlin.dsl.accessors._624aae704a5c30b505ab3598db099943.implementation
+import gradle.kotlin.dsl.accessors._f498a892b084b6e1620083bdb51439d5.implementation
 
 plugins {
     id("com.google.devtools.ksp")

diff --git a/build-logic/src/main/kotlin/testing-convention.gradle.kts b/build-logic/src/main/kotlin/testing-convention.gradle.kts
@@ -1,5 +1,5 @@
-import gradle.kotlin.dsl.accessors._624aae704a5c30b505ab3598db099943.androidTestImplementation
-import gradle.kotlin.dsl.accessors._624aae704a5c30b505ab3598db099943.testImplementation
+import gradle.kotlin.dsl.accessors._1c35da307f1540a2fdd9273b146bf0a7.androidTestImplementation
+import gradle.kotlin.dsl.accessors._1c35da307f1540a2fdd9273b146bf0a7.testImplementation
 
 applyBundle("testing") {
     dependencies {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,48 +1,60 @@
 [versions]
 
-# SDK
+#region ---- SDK
 compileSdk = "34"
 targetSdk = "34"
 minSdk = "23"
-composeCompiler = "1.5.8"
 
-# Android Core
-agp = "8.2.2"
+#region ---- Kotlin version dependent
+# https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
+composeCompiler = "1.5.10"
+# https://github.com/JetBrains/kotlin/releases
+org-jetbrains-kotlin-android = "1.9.22"
+# https://github.com/google/ksp/releases
+ksp = "1.9.22-1.0.17"
+#endregion
+
+#region ---- Android Core
+agp = "8.3.0"
 core-ktx = "1.12.0"
 lifecycleVer = "2.7.0"
 appcompat = "1.6.1"
+#endregion
 
 # Logs
 timber = "5.0.1"
 
 # Material
 material3 = "1.10.0"
 
-# Kotlin
-org-jetbrains-kotlin-android = "1.9.22"
+#region ---- Kotlin
 kotlinxCoroutines = "1.8.0"
-ksp = "1.9.22-1.0.16"
 kotlinxSerializationJson = "1.6.2"
+#endregion
 
-# Jetpack Compose
+#region ---- Jetpack Compose
 activity-compose = "1.8.2"
-compose-bom = "2024.02.00"
+compose-bom = "2024.02.02"
+#endregion
 
 # Navigation
 navigationCompose = "2.7.7"
 
-# Hilt
+#region ---- Hilt
 hilt = "2.50"
-hiltNavigation = "1.1.0"
-hiltExt = "1.1.0"
+hiltNavigation = "1.2.0"
+hiltExt = "1.2.0"
+#endregion
 
-# Retrofit
+#region ---- Retrofit
 okhttp = "4.12.0"
 retrofit = "2.9.0"
+#endregion
 
-# Room
+#region ---- Room
 retrofit2KotlinxSerializationConverter = "1.0.0"
 room = "2.6.1"
+#endregion
 
 # Coil
 coil = "2.5.0"