Moving Navigator ScreenModel to ScreenModel module

adrielcafe · Nov 15, 2023 · bc8d1d0 · bc8d1d0
1 parent 5e24ba8
commit bc8d1d0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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/...gator/screenModel/NavigatorScreenModel.kt → ...oyager/core/model/NavigatorScreenModel.kt b/...gator/screenModel/NavigatorScreenModel.kt → ...oyager/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