Migrate to decompose 2.2.0 (#80)

* Dump dependencies

* Migrate from parcelable and parcelize to kotlinx serializable

* Update api

* Make decompose dependency api

Author: xxfast

app/build.gradle.kts

@@ -1,13 +1,12 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Deb
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Dmg
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat.Msi
-import org.jetbrains.compose.experimental.dsl.IOSDevices
 
 plugins {
   kotlin("multiplatform")
+  kotlin("plugin.serialization")
   id("com.android.application")
   id("org.jetbrains.compose")
-  id("kotlin-parcelize")
 }
 
 @OptIn(org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi::class)
@@ -71,7 +70,6 @@ kotlin {
 
         implementation(libs.decompose)
         implementation(libs.decompose.compose.multiplatform)
-        implementation(libs.essenty.parcelable)
       }
     }
 
@@ -142,29 +140,5 @@ compose.desktop {
 }
 
 compose.experimental {
-  web.application {
-  }
-
-  uikit.application {
-    bundleIdPrefix = "io.github.xxfast.decompose.router.app"
-    projectName = "DecomposeRouterApp"
-
-    deployConfigurations {
-      simulator("IPhone12Pro") {
-        // Usage: ./gradlew iosDeployIPhone12ProDebug
-        device = IOSDevices.IPHONE_12_PRO
-      }
-
-      /*
-       * Usage: ./gradlew iosDeployDeviceDebug
-       *
-       * If your are getting "A valid provisioning profile for this executable was not found" error,
-       * see: https://developer.apple.com/forums/thread/128121?answerId=403323022#403323022
-       */
-      connectedDevice("Device") {
-        // Uncomment and fill with your Team ID
-        // teamId = ""
-      }
-    }
-  }
-}
+  web.application { }
+}

app/src/commonMain/kotlin/io/github/xxfast/decompose/router/app/screens/HomeScreen.kt

@@ -2,7 +2,7 @@ package io.github.xxfast.decompose.router.app.screens
 
 import androidx.compose.runtime.Composable
 import com.arkivanov.decompose.ExperimentalDecomposeApi
-import com.arkivanov.decompose.extensions.compose.jetbrains.stack.animation.predictiveBackAnimation
+import com.arkivanov.decompose.extensions.compose.jetbrains.stack.animation.predictiveback.predictiveBackAnimation
 import com.arkivanov.decompose.extensions.compose.jetbrains.stack.animation.slide
 import com.arkivanov.decompose.extensions.compose.jetbrains.stack.animation.stackAnimation
 import com.arkivanov.decompose.router.stack.pop

app/src/commonMain/kotlin/io/github/xxfast/decompose/router/app/screens/HomeStateModels.kt

@@ -1,12 +1,11 @@
 package io.github.xxfast.decompose.router.app.screens
 
-import com.arkivanov.essenty.parcelable.Parcelable
-import com.arkivanov.essenty.parcelable.Parcelize
+import kotlinx.serialization.Serializable
 
-@Parcelize
-sealed class HomeScreens: Parcelable {
-  data object List: HomeScreens()
-  data object Nested: HomeScreens()
-  data class Details(val number: Int): HomeScreens()
+@Serializable
+sealed class HomeScreens {
+  @Serializable data object List: HomeScreens()
+  @Serializable data object Nested: HomeScreens()
+  @Serializable data class Details(val number: Int): HomeScreens()
 }
 

app/src/commonMain/kotlin/io/github/xxfast/decompose/router/app/screens/details/DetailStateModels.kt

@@ -1,7 +1,6 @@
 package io.github.xxfast.decompose.router.app.screens.details
 
-import com.arkivanov.essenty.parcelable.Parcelable
-import com.arkivanov.essenty.parcelable.Parcelize
+import kotlinx.serialization.Serializable
 
-@Parcelize
-data class DetailState(val count: Int): Parcelable
+@Serializable
+data class DetailState(val count: Int)

app/src/commonMain/kotlin/io/github/xxfast/decompose/router/app/screens/list/ListScreen.kt

@@ -35,14 +35,19 @@ import io.github.xxfast.decompose.router.app.screens.FAVORITE_TAG
 import io.github.xxfast.decompose.router.app.screens.LIST_TAG
 import io.github.xxfast.decompose.router.app.screens.TITLE_BAR_TAG
 import io.github.xxfast.decompose.router.app.screens.TOOLBAR_TAG
+import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.serializer
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, InternalSerializationApi::class)
 @Composable
 fun ListScreen(
   onSelect: (count: Int) -> Unit,
   onSelectColor: () -> Unit,
 ) {
-  val instance: ListInstance = rememberOnRoute(ListInstance::class) { savedState ->
+  val instance: ListInstance = rememberOnRoute(
+    type = ListInstance::class,
+    strategy = ListState::class.serializer()
+  ) { savedState ->
     ListInstance(savedState)
   }
 

app/src/commonMain/kotlin/io/github/xxfast/decompose/router/app/screens/list/ListStateModels.kt

@@ -1,9 +1,7 @@
 package io.github.xxfast.decompose.router.app.screens.list
 
-import com.arkivanov.essenty.parcelable.Parcelable
-import com.arkivanov.essenty.parcelable.Parcelize
+import kotlinx.serialization.Serializable
 
-@Parcelize
-data class ListState(val items: List<Int>? = Loading): Parcelable
+@Serializable data class ListState(val items: List<Int>? = Loading)
 
 val Loading: Nothing? = null

app/src/commonMain/kotlin/io/github/xxfast/decompose/router/app/screens/nested/NestedScreenModels.kt

@@ -1,10 +1,9 @@
 package io.github.xxfast.decompose.router.app.screens.nested
 
-import com.arkivanov.essenty.parcelable.Parcelable
-import com.arkivanov.essenty.parcelable.Parcelize
+import kotlinx.serialization.Serializable
 
-@Parcelize
-sealed class NestedScreens: Parcelable {
+@Serializable
+sealed class NestedScreens {
   data object Home: NestedScreens()
   data object Primary: NestedScreens()
   data object Secondary: NestedScreens()

build.gradle.kts

@@ -16,6 +16,7 @@ buildscript {
     classpath(libs.agp)
     classpath(libs.compose.multiplatform)
     classpath(libs.kotlin.gradle.plugin)
+    classpath(libs.kotlinx.serialization)
   }
 }
 

decompose-router-wear/build.gradle.kts

@@ -23,7 +23,6 @@ kotlin {
         implementation(libs.wear.compose.material)
         implementation(libs.wear.compose.ui.tooling)
         implementation(libs.androidx.activity.compose)
-        implementation(libs.essenty.parcelable)
         implementation(libs.decompose)
         implementation(libs.decompose.compose.multiplatform)
       }

decompose-router-wear/src/androidMain/kotlin/io/github/xxfast/decompose/router/wear/content/RoutedContent.kt

@@ -1,6 +1,5 @@
 package io.github.xxfast.decompose.router.wear.content
 
-import android.os.Parcelable
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
@@ -23,10 +22,11 @@ import io.github.xxfast.decompose.router.LocalRouter
 import io.github.xxfast.decompose.router.LocalRouterContext
 import io.github.xxfast.decompose.router.Router
 import io.github.xxfast.decompose.router.RouterContext
+import kotlinx.serialization.Serializable
 
 @OptIn(ExperimentalWearFoundationApi::class)
 @Composable
-fun <C : Parcelable> RoutedContent(
+fun <C : @Serializable Any> RoutedContent(
   router: Router<C>,
   modifier: Modifier = Modifier,
   content: @Composable (C) -> Unit,