Update Dependencies

swapnil-musale · Jun 15, 2024 · c873493 · c873493
1 parent f21fdc4
commit c873493
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 16 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -37,6 +37,7 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
             )
+            signingConfig = signingConfigs.getByName("debug")
         }
         getByName("debug") {
             isDebuggable = true
@@ -65,16 +66,18 @@ dependencies {
     implementation(projects.domain)
     implementation(projects.data)
 
-    implementation(libs.bundles.androidx.compose.bom)
     implementation(platform(libs.kotlin.bom))
+    implementation(libs.bundles.androidx.compose.bom)
 
     implementation(libs.core.ktx)
-    implementation(libs.androidx.splashScreen)
     implementation(libs.activity.compose)
-    implementation(libs.compose.navigation)
-    implementation(libs.compose.lifecycle)
+    implementation(libs.androidx.splashScreen)
     implementation(libs.androidx.lifecycle)
 
+    implementation(libs.compose.lifecycle)
+    implementation(libs.compose.viewmodel)
+    implementation(libs.compose.navigation)
+
     implementation(libs.hilt.android)
     implementation(libs.hilt.navigation)
     ksp(libs.hilt.compiler)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -34,4 +34,9 @@
 # see https://github.com/square/retrofit/issues/3751
 -keep,allowobfuscation,allowshrinking interface retrofit2.Call
 -keep,allowobfuscation,allowshrinking class retrofit2.Response
--keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
+# Please add these rules to your existing keep rules in order to suppress warnings.
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn com.devx.data.repository.JokeRepositoryImpl
+-dontwarn com.devx.data.source.remote.JokeApi
diff --git a/app/src/main/java/com/devx/jetjoke/navigation/AppNavGraph.kt b/app/src/main/java/com/devx/jetjoke/navigation/AppNavGraph.kt
@@ -1,7 +1,6 @@
 package com.devx.jetjoke.navigation
 
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
@@ -20,8 +19,7 @@ fun AppNavGraph() {
     ) {
         composable(route = ScreenRoute.HomeScreen.route) {
             val homeViewModel: HomeViewModel = hiltViewModel()
-            val uiState =
-                homeViewModel.uiState.collectAsStateWithLifecycle(lifecycleOwner = LocalLifecycleOwner.current)
+            val uiState = homeViewModel.uiState.collectAsStateWithLifecycle()
 
             HomeScreen(
                 uiState = uiState.value,

diff --git a/app/src/main/java/com/devx/jetjoke/navigation/ScreenRoute.kt b/app/src/main/java/com/devx/jetjoke/navigation/ScreenRoute.kt
@@ -1,5 +1,7 @@
 package com.devx.jetjoke.navigation
 
-sealed class ScreenRoute(val route: String) {
-    object HomeScreen : ScreenRoute(route = "home")
+sealed class ScreenRoute(
+    val route: String,
+) {
+    data object HomeScreen : ScreenRoute(route = "home")
 }
diff --git a/data/proguard-rules.pro b/data/proguard-rules.pro
@@ -27,4 +27,7 @@
 # see https://github.com/square/retrofit/issues/3751
 -keep,allowobfuscation,allowshrinking interface retrofit2.Call
 -keep,allowobfuscation,allowshrinking class retrofit2.Response
--keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
+-dontwarn com.devx.data.repository.JokeRepositoryImpl
+-dontwarn com.devx.data.source.remote.JokeApi
diff --git a/data/src/main/java/com/devx/data/model/JokeResponseDto.kt b/data/src/main/java/com/devx/data/model/JokeResponseDto.kt
@@ -4,8 +4,10 @@ import androidx.annotation.Keep
 import com.devx.domain.model.JokeResponse
 import com.devx.domain.util.Mapper
 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 
 @Keep
+@JsonClass(generateAdapter = true)
 data class JokeResponseDto(
 
     @field:Json(name = "delivery")

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,22 +1,23 @@
 [versions]
 
 # Plugin Version
-androidGradlePlugin = "8.4.1"
-androidLibrary = "8.4.1"
+androidGradlePlugin = "8.5.0"
+androidLibrary = "8.5.0"
 kotlin = "2.0.0"
 jvmTarget = "1.8"
 kotlinKsp = "2.0.0-1.0.22"
 detektVersion = "1.23.6"
 
 # Library Version
 kotlinBOM = "2.0.0"
-composeBOM = "2024.05.00"
+composeBOM = "2024.06.00"
 
 coreKtx = "1.13.1"
+composeViewmodel = "2.8.2"
 splashScreen = "1.0.1"
 activityCompose = "1.9.0"
 composeNavigation = "2.7.7"
-androidXLifecycle = "2.8.1"
+androidXLifecycle = "2.8.2"
 androidMaterial3 = "1.2.1"
 hiltAndroid = "2.51.1"
 retrofit = "2.11.0"
@@ -44,11 +45,12 @@ compose-navigation = { module = "androidx.navigation:navigation-compose", versio
 
 # Compose
 compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBOM" }
-androidx-material3 = { module = "androidx.compose.material3:material3", version.ref = "androidMaterial3" }
 ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 compose-ui = { module = "androidx.compose.ui:ui" }
 compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
 compose-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
+compose-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "composeViewmodel" }
+androidx-material3 = { module = "androidx.compose.material3:material3", version.ref = "androidMaterial3" }
 
 # Hilt
 hilt-android = { module = "com.google.dagger:hilt-android", version.ref = "hiltAndroid" }