Update project

michaelbel · michaelbel · commit 51fb6f85ddd3 · 2024-11-16T18:54:01.000+03:00
diff --git a/.run/iosApp.run.xml b/.run/iosApp.run.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="iosApp" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" EXEC_TARGET_ID="D471F79B-CC8F-4B86-8CBE-6AD86EC4DB25" XCODE_PROJECT="$PROJECT_DIR$/iosApp/iosApp.xcodeproj" XCODE_CONFIGURATION="Debug" XCODE_SCHEME="iosApp">
+  <configuration default="false" name="iosApp" type="KmmRunConfiguration" factoryName="iOS Application" CONFIG_VERSION="1" EXEC_TARGET_ID="3AE3B360-C46D-4989-9B2E-EBC66F72DD3E" XCODE_PROJECT="$PROJECT_DIR$/iosApp/iosApp.xcodeproj" XCODE_CONFIGURATION="Debug" XCODE_SCHEME="iosApp">
     <method v="2">
       <option name="com.jetbrains.kmm.ios.BuildIOSAppTask" enabled="true" />
     </method>
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -10,7 +10,6 @@ plugins {
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.androidx.navigation.safeargs)
     alias(libs.plugins.palantir.git)
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,6 @@ plugins {
     alias(libs.plugins.google.services) apply false
     alias(libs.plugins.google.firebase.appdistribution) apply false
     alias(libs.plugins.google.firebase.crashlytics) apply false
-    alias(libs.plugins.androidx.navigation.safeargs) apply false
     alias(libs.plugins.buildkonfig) apply false
     alias(libs.plugins.spotless)
     alias(libs.plugins.detekt)
diff --git a/core/navigation/build.gradle.kts b/core/navigation/build.gradle.kts
@@ -15,9 +15,6 @@ kotlin {
     iosSimulatorArm64()
 
     sourceSets {
-        /*androidMain.dependencies {
-            api(libs.bundles.navigation.android)
-        }*/
         commonMain.dependencies {
             api(libs.bundles.jetbrains.androidx.navigation.compose.common)
             api(libs.bundles.jetbrains.androidx.core.bundle.common)
diff --git a/feature/account/build.gradle.kts b/feature/account/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
diff --git a/feature/account/src/commonMain/kotlin/org/michaelbel/movies/account/AccountDestination.kt b/feature/account/src/commonMain/kotlin/org/michaelbel/movies/account/AccountDestination.kt
@@ -1,10 +1,14 @@
 package org.michaelbel.movies.account
 
+import kotlinx.serialization.Serializable
 import org.michaelbel.movies.navigation.MoviesNavigationDestination
 
 internal object AccountDestination: MoviesNavigationDestination {
 
     override val route: String = "account"
 
     override val destination: String = "account"
-}
+}
+
+@Serializable
+object AccountRoute
diff --git a/feature/auth/build.gradle.kts b/feature/auth/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
diff --git a/feature/auth/src/commonMain/kotlin/org/michaelbel/movies/auth/AuthDestination.kt b/feature/auth/src/commonMain/kotlin/org/michaelbel/movies/auth/AuthDestination.kt
@@ -1,10 +1,14 @@
 package org.michaelbel.movies.auth
 
+import kotlinx.serialization.Serializable
 import org.michaelbel.movies.navigation.MoviesNavigationDestination
 
 internal object AuthDestination: MoviesNavigationDestination {
 
     override val route: String = "auth"
 
     override val destination: String = "auth"
-}
+}
+
+@Serializable
+object AuthRoute
diff --git a/feature/details/build.gradle.kts b/feature/details/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
diff --git a/feature/details/src/commonMain/kotlin/org/michaelbel/movies/details/DetailsDestination.kt b/feature/details/src/commonMain/kotlin/org/michaelbel/movies/details/DetailsDestination.kt
@@ -1,10 +1,17 @@
 package org.michaelbel.movies.details
 
+import kotlinx.serialization.Serializable
 import org.michaelbel.movies.navigation.MoviesNavigationDestination
 
 internal object DetailsDestination: MoviesNavigationDestination {
 
     override val route: String = "movie?movieList={movieList}&movieId={movieId}"
 
     override val destination: String = "movie"
-}
+}
+
+@Serializable
+class DetailsRoute(
+    val movieList: String,
+    val movieId: Int
+)
diff --git a/feature/feed/build.gradle.kts b/feature/feed/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
diff --git a/feature/feed/src/commonMain/kotlin/org/michaelbel/movies/feed/FeedDestination.kt b/feature/feed/src/commonMain/kotlin/org/michaelbel/movies/feed/FeedDestination.kt
@@ -1,10 +1,14 @@
 package org.michaelbel.movies.feed
 
+import kotlinx.serialization.Serializable
 import org.michaelbel.movies.navigation.MoviesNavigationDestination
 
 object FeedDestination: MoviesNavigationDestination {
 
     override val route: String = "feed"
 
     override val destination: String = "feed"
-}
+}
+
+@Serializable
+object FeedRoute
diff --git a/feature/gallery/build.gradle.kts b/feature/gallery/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
diff --git a/feature/gallery/src/commonMain/kotlin/org/michaelbel/movies/gallery/GalleryDestination.kt b/feature/gallery/src/commonMain/kotlin/org/michaelbel/movies/gallery/GalleryDestination.kt
@@ -1,10 +1,16 @@
 package org.michaelbel.movies.gallery
 
+import kotlinx.serialization.Serializable
 import org.michaelbel.movies.navigation.MoviesNavigationDestination
 
 internal object GalleryDestination: MoviesNavigationDestination {
 
     override val route: String = "gallery/{movieId}"
 
     override val destination: String = "gallery"
-}
+}
+
+@Serializable
+class GalleryRoute(
+    val movieId: Int
+)
diff --git a/feature/search/build.gradle.kts b/feature/search/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
diff --git a/feature/search/src/commonMain/kotlin/org/michaelbel/movies/search/SearchDestination.kt b/feature/search/src/commonMain/kotlin/org/michaelbel/movies/search/SearchDestination.kt
@@ -1,10 +1,14 @@
 package org.michaelbel.movies.search
 
+import kotlinx.serialization.Serializable
 import org.michaelbel.movies.navigation.MoviesNavigationDestination
 
 internal object SearchDestination: MoviesNavigationDestination {
 
     override val route: String = "search"
 
     override val destination: String = "search"
-}
+}
+
+@Serializable
+object SearchRoute
diff --git a/feature/settings/build.gradle.kts b/feature/settings/build.gradle.kts
@@ -4,6 +4,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
+    alias(libs.plugins.kotlin.serialization)
     alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
diff --git a/feature/settings/src/commonMain/kotlin/org/michaelbel/movies/settings/SettingsDestination.kt b/feature/settings/src/commonMain/kotlin/org/michaelbel/movies/settings/SettingsDestination.kt
@@ -1,10 +1,14 @@
 package org.michaelbel.movies.settings
 
+import kotlinx.serialization.Serializable
 import org.michaelbel.movies.navigation.MoviesNavigationDestination
 
 internal object SettingsDestination: MoviesNavigationDestination {
 
     override val route: String = "settings"
 
     override val destination: String = "settings"
-}
+}
+
+@Serializable
+object SettingsRoute
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -29,32 +29,31 @@ androidx-autofill = "1.1.0"
 androidx-benchmark = "1.3.3"
 androidx-biometric-ktx = "1.2.0-alpha05"
 androidx-browser = "1.8.0"
-androidx-compose-animation = "1.6.8" # need to update constraint-layout lib (details screen)
-androidx-compose-foundation = "1.6.8" # need to update constraint-layout lib (details screen)
-androidx-compose-runtime = "1.6.8" # need to update constraint-layout lib (details screen)
-androidx-compose-ui = "1.6.8" # need to update constraint-layout lib (details screen)
-androidx-compose-ui-tooling-preview-desktop = "1.6.8"
-androidx-compose-material = "1.7.0"
-androidx-compose-material3 = "1.2.1" # need to update constraint-layout lib (details screen)
-androidx-core-ktx = "1.13.1"
+androidx-compose-animation = "1.7.5"
+androidx-compose-foundation = "1.7.5"
+androidx-compose-runtime = "1.7.5"
+androidx-compose-ui = "1.7.5"
+androidx-compose-ui-tooling-preview-desktop = "1.7.0"
+androidx-compose-material = "1.7.5"
+androidx-compose-material3 = "1.3.1"
+androidx-core-ktx = "1.15.0"
 androidx-core-splashscreen = "1.0.1"
 androidx-datastore = "1.1.1"
 androidx-datastore-core-okio-jvm = "1.1.1"
-androidx-lifecycle = "2.8.6"
-androidx-lifecycle-viewmodel = "2.8.6"
+androidx-lifecycle = "2.8.7"
+androidx-lifecycle-viewmodel = "2.8.7"
 androidx-glance = "1.1.1"
-androidx-navigation = "2.8.3"
 androidx-palette-ktx = "1.0.0"
-androidx-paging = "3.3.2"
-androidx-room = "2.7.0-alpha10"
+androidx-paging = "3.3.4"
+androidx-room = "2.7.0-alpha11"
 androidx-startup = "1.2.0"
 androidx-sqlite = "2.5.0-SNAPSHOT"
 androidx-test-ext = "1.2.1"
 androidx-test-uiautomator = "2.3.0"
 androidx-test-espresso = "3.6.1"
 androidx-test-espresso-device = "1.0.1"
-androidx-work = "2.9.1"
-compose = "1.6.11"
+androidx-work = "2.10.0"
+compose = "1.6.11" # 1.7.0 & 1.7.1 crash on iOS
 jetbrains-androidx-navigation-compose = "2.8.0-alpha02" # 2.8.0-alpha08 crash androidApp
 jetbrains-androidx-lifecycle-viewmodel-compose = "2.8.0" # 2.8.1 crash desktopApp
 jetbrains-androidx-core-bundle = "1.0.1"
@@ -129,7 +128,6 @@ androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-ru
 androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle-viewmodel" }
 androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
 androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "androidx-lifecycle" }
-androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidx-navigation" }
 androidx-palette-ktx = { module = "androidx.palette:palette-ktx", version.ref = "androidx-palette-ktx" }
 androidx-paging-common-ktx = { module = "androidx.paging:paging-common-ktx", version.ref = "androidx-paging" }
 androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "androidx-paging" }
@@ -296,9 +294,6 @@ lifecycle-android = [
     "androidx-lifecycle-runtime-compose",
     "androidx-lifecycle-process"
 ]
-navigation-android = [
-    "androidx-navigation-compose"
-]
 paging-android = [
     "androidx-paging-compose"
 ]
@@ -425,6 +420,5 @@ google-firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.
 huawei-services = { id = "com.huawei.agconnect", version.ref = "huawei-services" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
-androidx-navigation-safeargs = { id = "androidx.navigation.safeargs.kotlin", version.ref = "androidx-navigation" }
 palantir-git = { id = "com.palantir.git-version", version.ref = "palantir-git" }
 buildkonfig = { id = "com.codingfeline.buildkonfig", version.ref = "buildkonfig" }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ plugins {`
`10`	`10`	`alias(libs.plugins.kotlin.compose)`
`11`	`11`	`alias(libs.plugins.android.application)`
`12`	`12`	`alias(libs.plugins.kotlin.android)`
`13`		`- alias(libs.plugins.androidx.navigation.safeargs)`
`14`	`13`	`alias(libs.plugins.palantir.git)`
`15`	`14`	`}`
`16`	`15`