make 'experimental' navigation the default (#751)

freeletics · Apr 30, 2024 · e82f75f · e82f75f
1 parent c609f7b
commit e82f75f
Show file tree

Hide file tree

Showing 36 changed files with 40 additions and 111 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ Change Log
 
 ## 0.24.0 **UNRELEASED**
 
+### Navigation
+
+- Khonshu's own navigation implementation has been moved from `navigation-experimental`
+  into the main `navigation` artifact.
+
 ### Codegen
 
 - Removed `experimentalNavigation` option and `@UseExperimentalNavigation`. The generated

diff --git a/navigation-experimental/api/navigation-experimental.api b/navigation-experimental/api/navigation-experimental.api
diff --git a/navigation-experimental/gradle.properties b/navigation-experimental/gradle.properties
diff --git a/navigation-experimental/navigation-experimental.gradle.kts b/navigation-experimental/navigation-experimental.gradle.kts
@@ -1,47 +1,3 @@
-import com.android.build.api.dsl.CommonExtension
-
 plugins {
     alias(libs.plugins.fgp.android)
-    alias(libs.plugins.poko)
-    alias(libs.plugins.fgp.publish)
-}
-
-freeletics {
-    optIn("com.freeletics.khonshu.navigation.internal.InternalNavigationApi")
-
-    useCompose()
-
-    android {
-        enableParcelize()
-    }
-}
-
-extensions.configure(CommonExtension::class.java) {
-    lint {
-        disable.add("UnsafeOptInUsageError")
-    }
-}
-
-dependencies {
-    api(projects.navigation)
-    api(libs.androidx.compose.runtime)
-    api(libs.androidx.compose.ui)
-    api(libs.collections.immutable)
-
-    implementation(libs.coroutines.core)
-    implementation(libs.androidx.annotations)
-    implementation(libs.androidx.activity)
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.compose.runtime.saveable)
-    implementation(libs.androidx.compose.foundation)
-    implementation(libs.androidx.core)
-    implementation(libs.androidx.viewmodel)
-    implementation(libs.androidx.viewmodel.compose)
-    implementation(libs.androidx.viewmodel.savedstate)
-    implementation(libs.androidx.savedstate)
-    implementation(libs.uri)
-
-    testImplementation(libs.junit)
-    testImplementation(libs.truth)
-    testImplementation(libs.kotlin.parcelize)
 }
diff --git a/navigation-experimental/src/test/kotlin/com/freeletics/khonshu/navigation/test/Routes.kt b/navigation-experimental/src/test/kotlin/com/freeletics/khonshu/navigation/test/Routes.kt
diff --git a/navigation/api/android/navigation.api b/navigation/api/android/navigation.api
@@ -74,6 +74,10 @@ public class com/freeletics/khonshu/navigation/NavEventNavigator : com/freeletic
 	public fun resetToRoot (Lcom/freeletics/khonshu/navigation/NavRoot;)V
 }
 
+public final class com/freeletics/khonshu/navigation/NavHostKt {
+	public static final fun NavHost (Lcom/freeletics/khonshu/navigation/NavRoot;Lkotlinx/collections/immutable/ImmutableSet;Landroidx/compose/ui/Modifier;Lkotlinx/collections/immutable/ImmutableSet;Lkotlinx/collections/immutable/ImmutableSet;Lcom/freeletics/khonshu/navigation/NavEventNavigator;Lkotlin/jvm/functions/Function1;Landroidx/compose/runtime/Composer;II)V
+}
+
 public abstract interface class com/freeletics/khonshu/navigation/NavRoot : com/freeletics/khonshu/navigation/BaseRoute {
 }
 

diff --git a/navigation/navigation.gradle.kts b/navigation/navigation.gradle.kts
@@ -31,12 +31,15 @@ extensions.configure(CommonExtension::class.java) {
 
 dependencies {
     "commonMainApi"(libs.jetbrains.compose.runtime)
+    "commonMainApi"(libs.collections.immutable)
     "commonMainApi"(libs.uri)
 
+    "androidMainApi"(libs.androidx.compose.foundation)
     "androidMainApi"(libs.androidx.activity)
     "androidMainApi"(libs.androidx.activity.compose)
     "androidMainApi"(libs.androidx.core)
     "androidMainApi"(libs.androidx.lifecycle.common)
+    "androidMainApi"(libs.androidx.viewmodel.compose)
     "androidMainApi"(libs.androidx.viewmodel.savedstate)
     "androidMainApi"(libs.androidx.compose.ui)
     "androidMainApi"(libs.coroutines.core)

diff --git a/.../freeletics/khonshu/navigation/NavHost.kt → .../freeletics/khonshu/navigation/NavHost.kt b/.../freeletics/khonshu/navigation/NavHost.kt → .../freeletics/khonshu/navigation/NavHost.kt
diff --git a/...hu/navigation/internal/ActivityStarter.kt → ...hu/navigation/internal/ActivityStarter.kt b/...hu/navigation/internal/ActivityStarter.kt → ...hu/navigation/internal/ActivityStarter.kt
diff --git a/...khonshu/navigation/internal/MultiStack.kt → ...khonshu/navigation/internal/MultiStack.kt b/...khonshu/navigation/internal/MultiStack.kt → ...khonshu/navigation/internal/MultiStack.kt
diff --git a/.../internal/MultiStackNavigationExecutor.kt → .../internal/MultiStackNavigationExecutor.kt b/.../internal/MultiStackNavigationExecutor.kt → .../internal/MultiStackNavigationExecutor.kt
diff --git a/...al/MultiStackNavigationExecutorBuilder.kt → ...al/MultiStackNavigationExecutorBuilder.kt b/...al/MultiStackNavigationExecutorBuilder.kt → ...al/MultiStackNavigationExecutorBuilder.kt
diff --git a/...tics/khonshu/navigation/internal/Stack.kt → ...tics/khonshu/navigation/internal/Stack.kt b/...tics/khonshu/navigation/internal/Stack.kt → ...tics/khonshu/navigation/internal/Stack.kt
diff --git a/...khonshu/navigation/internal/StackEntry.kt → ...khonshu/navigation/internal/StackEntry.kt b/...khonshu/navigation/internal/StackEntry.kt → ...khonshu/navigation/internal/StackEntry.kt
diff --git a/...shu/navigation/internal/StoreViewModel.kt → ...shu/navigation/internal/StoreViewModel.kt b/...shu/navigation/internal/StoreViewModel.kt → ...shu/navigation/internal/StoreViewModel.kt
diff --git a/...ernal/MultiStackNavigationExecutorTest.kt → ...ernal/MultiStackNavigationExecutorTest.kt b/...ernal/MultiStackNavigationExecutorTest.kt → ...ernal/MultiStackNavigationExecutorTest.kt
diff --git a/...shu/navigation/internal/MultiStackTest.kt → ...shu/navigation/internal/MultiStackTest.kt b/...shu/navigation/internal/MultiStackTest.kt → ...shu/navigation/internal/MultiStackTest.kt
diff --git a/...shu/navigation/internal/StackEntryTest.kt → ...shu/navigation/internal/StackEntryTest.kt b/...shu/navigation/internal/StackEntryTest.kt → ...shu/navigation/internal/StackEntryTest.kt
diff --git a/.../khonshu/navigation/internal/StackTest.kt → .../khonshu/navigation/internal/StackTest.kt b/.../khonshu/navigation/internal/StackTest.kt → .../khonshu/navigation/internal/StackTest.kt
diff --git a/...navigation/internal/StoreViewModelTest.kt → ...navigation/internal/StoreViewModelTest.kt b/...navigation/internal/StoreViewModelTest.kt → ...navigation/internal/StoreViewModelTest.kt
diff --git a/...s/khonshu/navigation/test/Destinations.kt → ...s/khonshu/navigation/test/Destinations.kt b/...s/khonshu/navigation/test/Destinations.kt → ...s/khonshu/navigation/test/Destinations.kt
diff --git a/.../khonshu/navigation/test/FakeCloseable.kt → .../khonshu/navigation/test/FakeCloseable.kt b/.../khonshu/navigation/test/FakeCloseable.kt → .../khonshu/navigation/test/FakeCloseable.kt
diff --git a/navigation/src/androidUnitTest/kotlin/com/freeletics/khonshu/navigation/test/Routes.kt b/navigation/src/androidUnitTest/kotlin/com/freeletics/khonshu/navigation/test/Routes.kt
@@ -1,9 +1,10 @@
 package com.freeletics.khonshu.navigation.test
 
+import android.os.Parcelable
+import com.freeletics.khonshu.navigation.ExternalActivityRoute
 import com.freeletics.khonshu.navigation.InternalActivityRoute
 import com.freeletics.khonshu.navigation.NavRoot
 import com.freeletics.khonshu.navigation.NavRoute
-import com.freeletics.khonshu.navigation.internal.Parcelable
 import dev.drewhamilton.poko.Poko
 import kotlinx.parcelize.Parcelize
 
@@ -15,6 +16,10 @@ internal class SimpleRoute(val number: Int) : NavRoute, Parcelable
 @Parcelize
 internal class OtherRoute(val number: Int) : NavRoute, Parcelable
 
+@Poko
+@Parcelize
+internal class ThirdRoute(val number: Int) : NavRoute, Parcelable
+
 @Poko
 @Parcelize
 internal class DeepLinkRoute(
@@ -26,10 +31,18 @@ internal class DeepLinkRoute(
 @Parcelize
 internal class SimpleRoot(val number: Int) : NavRoot, Parcelable
 
+@Poko
+@Parcelize
+internal class OtherRoot(val number: Int) : NavRoot, Parcelable
+
 @Poko
 @Parcelize
 internal class SimpleActivity(val number: Int) : InternalActivityRoute()
 
+@Poko
+@Parcelize
+internal class OtherActivity(val number: Int) : ExternalActivityRoute
+
 @Poko
 @Parcelize
 internal class TestParcelable(val value: Int) : Parcelable
diff --git a/sample/simple/app/simple/app-simple.gradle.kts b/sample/simple/app/simple/app-simple.gradle.kts
@@ -12,8 +12,7 @@ freeletics {
 
 dependencies {
     implementation(libs.androidx.lifecycle.viewmodel.savedstate)
-    implementation(libs.khonshu.navigator)
-    implementation(libs.khonshu.navigator.compose)
+    implementation(libs.khonshu.navigation)
     implementation(projects.feature.bottomSheet.implementation)
     implementation(projects.feature.bottomSheet.nav)
     implementation(projects.feature.dialog.implementation)

diff --git a/...simple/feature/bottom-sheet/implementation/feature-bottom-sheet-implementation.gradle.kts b/...simple/feature/bottom-sheet/implementation/feature-bottom-sheet-implementation.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     api(libs.androidx.lifecycle.viewmodel.compose)
     api(libs.androidx.lifecycle.viewmodel.savedstate)
     api(libs.coroutines)
-    api(libs.khonshu.navigator)
+    api(libs.khonshu.navigation)
     api(libs.khonshu.statemachine)
     api(libs.khonshu.codegen)
     api(projects.feature.bottomSheet.nav)

diff --git a/sample/simple/feature/bottom-sheet/nav/feature-bottom-sheet-nav.gradle.kts b/sample/simple/feature/bottom-sheet/nav/feature-bottom-sheet-nav.gradle.kts
@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
     api(libs.khonshu.codegen)
-    api(libs.khonshu.navigator)
+    api(libs.khonshu.navigation)
 }
diff --git a/sample/simple/feature/dialog/implementation/feature-dialog-implementation.gradle.kts b/sample/simple/feature/dialog/implementation/feature-dialog-implementation.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     api(libs.androidx.lifecycle.viewmodel.compose)
     api(libs.androidx.lifecycle.viewmodel.savedstate)
     api(libs.coroutines)
-    api(libs.khonshu.navigator)
+    api(libs.khonshu.navigation)
     api(libs.khonshu.statemachine)
     api(libs.khonshu.codegen)
     api(projects.feature.dialog.nav)

diff --git a/sample/simple/feature/dialog/nav/feature-dialog-nav.gradle.kts b/sample/simple/feature/dialog/nav/feature-dialog-nav.gradle.kts
@@ -4,5 +4,5 @@ plugins {
 
 dependencies {
     api(libs.khonshu.codegen)
-    api(libs.khonshu.navigator)
+    api(libs.khonshu.navigation)
 }
diff --git a/sample/simple/feature/main/feature-main.gradle.kts b/sample/simple/feature/main/feature-main.gradle.kts
@@ -13,16 +13,15 @@ dependencies {
     api(libs.androidx.lifecycle.viewmodel.compose)
     api(libs.androidx.lifecycle.viewmodel.savedstate)
     api(libs.coroutines)
-    api(libs.khonshu.navigator.compose)
-    api(libs.khonshu.navigator.experimental)
+    api(libs.khonshu.navigation)
     api(libs.khonshu.statemachine)
 
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.foundation)
     implementation(libs.androidx.lifecycle.common)
     implementation(libs.androidx.lifecycle.viewmodel)
-    implementation(libs.khonshu.navigator)
+    implementation(libs.khonshu.navigation)
     implementation(libs.khonshu.codegen)
     implementation(projects.feature.root.nav)
 }
diff --git a/sample/simple/feature/new-root/implementation/feature-new-root-implementation.gradle.kts b/sample/simple/feature/new-root/implementation/feature-new-root-implementation.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     api(libs.androidx.lifecycle.viewmodel.compose)
     api(libs.androidx.lifecycle.viewmodel.savedstate)
     api(libs.coroutines)
-    api(libs.khonshu.navigator)
+    api(libs.khonshu.navigation)
     api(libs.khonshu.statemachine)
     api(libs.khonshu.codegen)
     api(projects.feature.newRoot.nav)

diff --git a/sample/simple/feature/new-root/nav/feature-new-root-nav.gradle.kts b/sample/simple/feature/new-root/nav/feature-new-root-nav.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    api(libs.khonshu.navigator)
+    api(libs.khonshu.navigation)
 }
diff --git a/sample/simple/feature/root/implementation/feature-root-implementation.gradle.kts b/sample/simple/feature/root/implementation/feature-root-implementation.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     api(libs.androidx.lifecycle.viewmodel.compose)
     api(libs.androidx.lifecycle.viewmodel.savedstate)
     api(libs.coroutines)
-    api(libs.khonshu.navigator)
+    api(libs.khonshu.navigation)
     api(libs.khonshu.statemachine)
     api(libs.khonshu.codegen)
     api(projects.feature.root.nav)

diff --git a/sample/simple/feature/root/nav/feature-root-nav.gradle.kts b/sample/simple/feature/root/nav/feature-root-nav.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    api(libs.khonshu.navigator)
+    api(libs.khonshu.navigation)
 }
diff --git a/sample/simple/feature/screen/implementation/feature-screen-implementation.gradle.kts b/sample/simple/feature/screen/implementation/feature-screen-implementation.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     api(libs.androidx.lifecycle.viewmodel.compose)
     api(libs.androidx.lifecycle.viewmodel.savedstate)
     api(libs.coroutines)
-    api(libs.khonshu.navigator)
+    api(libs.khonshu.navigation)
     api(libs.khonshu.statemachine)
     api(libs.khonshu.codegen)
     api(projects.feature.screen.nav)

diff --git a/sample/simple/feature/screen/nav/feature-screen-nav.gradle.kts b/sample/simple/feature/screen/nav/feature-screen-nav.gradle.kts
@@ -3,5 +3,5 @@ plugins {
 }
 
 dependencies {
-    api(libs.khonshu.navigator)
+    api(libs.khonshu.navigation)
 }
diff --git a/sample/simple/gradle/libs.versions.toml b/sample/simple/gradle/libs.versions.toml
@@ -48,9 +48,7 @@ coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version
 dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
 inject = { module = "javax.inject:javax.inject", version.ref = "inject" }
-khonshu-navigator = { module = "com.freeletics.khonshu:navigation", version.ref = "khonshu" }
-khonshu-navigator-experimental = { module = "com.freeletics.khonshu:navigation-experimental", version.ref = "khonshu" }
-khonshu-navigator-compose = { module = "com.freeletics.khonshu:navigation-compose", version.ref = "khonshu" }
+khonshu-navigation = { module = "com.freeletics.khonshu:navigation", version.ref = "khonshu" }
 khonshu-codegen-compiler = { module = "com.freeletics.khonshu:codegen-compiler", version.ref = "khonshu" }
 khonshu-codegen = { module = "com.freeletics.khonshu:codegen-runtime", version.ref = "khonshu" }
 khonshu-statemachine = { module = "com.freeletics.khonshu:state-machine", version.ref = "khonshu" }