From bc8d1d0697b415816420acb015716dc68912c9ce Mon Sep 17 00:00:00 2001
From: DevSrSouza <devsrsouza@gmail.com>
Date: Wed, 15 Nov 2023 20:13:09 -0300
Subject: [PATCH] Moving Navigator ScreenModel to ScreenModel module

---
 samples/android/build.gradle.kts                              | 2 +-
 samples/multi-module/feature-posts/build.gradle.kts           | 2 +-
 voyager-screenmodel/build.gradle.kts                          | 1 +
 .../cafe/adriel/voyager/core/model}/NavigatorScreenModel.kt   | 4 +---
 4 files changed, 4 insertions(+), 5 deletions(-)
 rename {voyager-navigator/src/commonMain/kotlin/cafe/adriel/voyager/navigator/screenModel => voyager-screenmodel/src/commonMain/kotlin/cafe/adriel/voyager/core/model}/NavigatorScreenModel.kt (88%)

diff --git a/samples/android/build.gradle.kts b/samples/android/build.gradle.kts
index b811e450..3dcaa778 100644
--- a/samples/android/build.gradle.kts
+++ b/samples/android/build.gradle.kts
@@ -22,7 +22,7 @@ kapt {
 }
 
 dependencies {
-    implementation(projects.voyagerScreenModel)
+    implementation(projects.voyagerScreenmodel)
     implementation(projects.voyagerNavigator)
     implementation(projects.voyagerTabNavigator)
     implementation(projects.voyagerBottomSheetNavigator)
diff --git a/samples/multi-module/feature-posts/build.gradle.kts b/samples/multi-module/feature-posts/build.gradle.kts
index 9ebff409..cb1dd70e 100644
--- a/samples/multi-module/feature-posts/build.gradle.kts
+++ b/samples/multi-module/feature-posts/build.gradle.kts
@@ -12,7 +12,7 @@ android {
 }
 
 dependencies {
-    implementation(projects.voyagerScreenModel)
+    implementation(projects.voyagerScreenmodel)
     implementation(projects.voyagerNavigator)
 
     implementation(projects.samples.multiModule.navigation)
diff --git a/voyager-screenmodel/build.gradle.kts b/voyager-screenmodel/build.gradle.kts
index af086e71..94981668 100644
--- a/voyager-screenmodel/build.gradle.kts
+++ b/voyager-screenmodel/build.gradle.kts
@@ -16,6 +16,7 @@ kotlin {
         val commonMain by getting {
             dependencies {
                 api(projects.voyagerCore)
+                api(projects.voyagerNavigator)
                 compileOnly(compose.runtime)
                 compileOnly(compose.runtimeSaveable)
                 implementation(libs.coroutines.core)
diff --git a/voyager-navigator/src/commonMain/kotlin/cafe/adriel/voyager/navigator/screenModel/NavigatorScreenModel.kt b/voyager-screenmodel/src/commonMain/kotlin/cafe/adriel/voyager/core/model/NavigatorScreenModel.kt
similarity index 88%
rename from voyager-navigator/src/commonMain/kotlin/cafe/adriel/voyager/navigator/screenModel/NavigatorScreenModel.kt
rename to voyager-screenmodel/src/commonMain/kotlin/cafe/adriel/voyager/core/model/NavigatorScreenModel.kt
index ea656231..7c43086d 100644
--- a/voyager-navigator/src/commonMain/kotlin/cafe/adriel/voyager/navigator/screenModel/NavigatorScreenModel.kt
+++ b/voyager-screenmodel/src/commonMain/kotlin/cafe/adriel/voyager/core/model/NavigatorScreenModel.kt
@@ -1,12 +1,10 @@
-package cafe.adriel.voyager.navigator.screenModel
+package cafe.adriel.voyager.core.model
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisallowComposableCalls
 import androidx.compose.runtime.remember
 import cafe.adriel.voyager.core.annotation.ExperimentalVoyagerApi
 import cafe.adriel.voyager.core.annotation.InternalVoyagerApi
-import cafe.adriel.voyager.core.model.ScreenModel
-import cafe.adriel.voyager.core.model.ScreenModelStore
 import cafe.adriel.voyager.navigator.Navigator
 import cafe.adriel.voyager.navigator.lifecycle.NavigatorDisposable
 import cafe.adriel.voyager.navigator.lifecycle.NavigatorLifecycleStore