updated dependencies, fix conflicts

kasem-sm · Jan 24, 2023 · 0254340 · 0254340
1 parent 4e83814
commit 0254340
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 32 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,8 +26,8 @@ apply plugin: 'dagger.hilt.android.plugin'
 
 android {
 	defaultConfig {
-		versionCode = 4
-		versionName = "1.3"
+		versionCode = 5
+		versionName = "2.5"
 		applicationId "kasem.sm.slime"
 	}
 }

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        kspVersion = '1.7.20-1.0.6'
+        kspVersion = '1.8.0-1.0.8'
     }
     repositories {
         google()

diff --git a/common-test-utils/src/main/java/kasem/sm/common_test_utils/AssertionUtils.kt b/common-test-utils/src/main/java/kasem/sm/common_test_utils/AssertionUtils.kt
@@ -4,7 +4,7 @@
  */
 package kasem.sm.common_test_utils
 
-import app.cash.turbine.FlowTurbine
+import app.cash.turbine.ReceiveTurbine
 import app.cash.turbine.test
 import com.google.common.truth.Truth
 import kasem.sm.core.domain.Stage
@@ -24,7 +24,7 @@ infix fun Boolean.shouldBe(bool: Boolean) {
 }
 
 suspend inline fun Flow<Stage>.shouldBeInOrder(
-    crossinline scope: suspend FlowTurbine<Stage>.() -> Unit
+    crossinline scope: suspend ReceiveTurbine<Stage>.() -> Unit
 ) {
     test {
         scope()

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,31 +3,31 @@ accompanist = "0.26.4-beta"
 annotation = "1.5.0"
 coil = "2.2.2"
 commonmark = "0.19.0"
-compose = "1.3.0-rc01"
-composeActivity = "1.7.0-alpha01"
-composeCompiler = "1.3.2"
-composeMaterial3 = "1.0.0-rc01"
-composeUiTest = "1.3.0-rc01"
+compose = "1.4.0-alpha04"
+composeActivity = "1.7.0-alpha03"
+composeCompiler = "1.4.0"
+composeMaterial3 = "1.1.0-alpha04"
+composeUiTest = "1.4.0-alpha04"
 corektx = "1.9.0"
 coreTesting = "2.1.0"
 coroutines = "1.6.4"
-crypto = "1.1.0-alpha03"
-destination = "1.7.21-beta"
-dynamicLink = "21.0.2"
+crypto = "1.1.0-alpha04"
+destination = "1.8.33-beta"
+dynamicLink = "21.1.0"
 espressoCore = "3.5.0-beta01"
-gradleplugin = "7.2.1"
+gradleplugin = "7.4.0"
 glance = "1.0.0-alpha05"
 gms = "4.3.10"
-hilt = "2.44"
+hilt = "2.44.2"
 hiltNavigationCompose = "1.0.0"
 hiltWork = "1.0.0"
 javaxInject = "1"
 junit = "4.13.2"
 junitExt = "1.1.4-beta01"
-kotlin = "1.7.20"
-ktor = "2.1.2"
+kotlin = "1.8.0"
+ktor = "2.2.2"
 lifecycle = "2.6.0-alpha02"
-material = "1.8.0-alpha01"
+material = "1.9.0-alpha01"
 mockk = "1.13.2"
 reflect = "1.7.20"
 room = "2.5.0-beta01"
@@ -38,7 +38,7 @@ timber = "5.0.1"
 truth = "1.1.3"
 turbine = "0.11.0"
 versionCheck = "0.38.0"
-work = "2.8.0-beta01"
+work = "2.8.0-rc01"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "composeActivity" }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri May 13 09:55:33 IST 2022
+#Tue Jan 24 20:16:08 IST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/screen/ui-home/src/main/java/kasem/sm/ui_home/HomeContent.kt b/screen/ui-home/src/main/java/kasem/sm/ui_home/HomeContent.kt
@@ -81,18 +81,20 @@ internal fun HomeContent(
                     navigateToSubscriptionScreen = navigateToSubscriptionScreen
                 )
 
-                item {
-                    SlimeHeader(text = stringResource(id = R.string.daily_read_header))
-                }
+                state.dailyReadArticle?.let {
+                    item {
+                        SlimeHeader(text = stringResource(id = R.string.daily_read_header))
+                    }
 
-                item {
-                    DailyReadArticle(
-                        modifier = Modifier.semantics { testTag = "daily_read_article_view" },
-                        article = state.dailyReadArticle,
-                        imageLoader = imageLoader,
-                        onArticleClick = onArticleClick,
-                        onBookmarkClick = onBookmarkClick
-                    )
+                    item {
+                        DailyReadArticle(
+                            modifier = Modifier.semantics { testTag = "daily_read_article_view" },
+                            article = state.dailyReadArticle,
+                            imageLoader = imageLoader,
+                            onArticleClick = onArticleClick,
+                            onBookmarkClick = onBookmarkClick
+                        )
+                    }
                 }
 
                 item {