Export ViewModel dependency to remove Lifecycle prefixes in Swift

Author: mlykotom

Fruitties/iosApp/iosApp/IOSViewModelStoreOwner.swift

@@ -3,16 +3,15 @@ import shared
 
 /// A ViewModelStoreOwner specifically for iOS.
 /// This is used with from iOS with Kotlin Multiplatform (KMP).
-class IOSViewModelStoreOwner: ObservableObject, SwiftViewModelStoreOwner {
+class IOSViewModelStoreOwner: ObservableObject, ViewModelStoreOwner {
 
-    var viewModelStore: Lifecycle_viewmodelViewModelStore =
-        Lifecycle_viewmodelViewModelStore()
+    var viewModelStore = ViewModelStore()
 
     /// This function allows retrieving the androidx ViewModel from the store.
-    func viewModel<T: Lifecycle_viewmodelViewModel>(
+    func viewModel<T: ViewModel>(
         key: String? = nil,
-        factory: Lifecycle_viewmodelViewModelProviderFactory,
-        extras: Lifecycle_viewmodelCreationExtras? = nil
+        factory: ViewModelProviderFactory,
+        extras: CreationExtras? = nil
     ) -> T {
         do {
             return try viewModelStore.getViewModel(

Fruitties/shared/build.gradle.kts

@@ -50,26 +50,17 @@ kotlin {
     // A step-by-step guide on how to include this library in an XCode
     // project can be found here:
     // https://developer.android.com/kotlin/multiplatform/migrate
-    val xcfName = "shared"
 
-    iosX64 {
-        binaries.framework {
-            baseName = xcfName
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach {
+        it.binaries.framework {
+            export(libs.androidx.lifecycle.viewmodel)
+            baseName = "shared"
         }
     }
-
-    iosArm64 {
-        binaries.framework {
-            baseName = xcfName
-        }
-    }
-
-    iosSimulatorArm64 {
-        binaries.framework {
-            baseName = xcfName
-        }
-    }
-
     // Source set declarations.
     // Declaring a target automatically creates a source set with the same name. By default, the
     // Kotlin Gradle Plugin creates additional source sets that depend on each other, since it is
@@ -90,7 +81,7 @@ kotlin {
                 implementation(libs.ktor.client.content.negotiation)
                 implementation(libs.ktor.serialization.kotlinx.json)
                 implementation(libs.skie.annotations)
-                implementation(libs.androidx.lifecycle.viewmodel)
+                api(libs.androidx.lifecycle.viewmodel)
                 implementation(libs.androidx.paging.common)
                 implementation(libs.androidx.room.runtime)
                 implementation(libs.sqlite.bundled)

Fruitties/shared/src/iosMain/kotlin/com/example/fruitties/di/viewmodel/ViewModelStoreUtil.kt

@@ -31,8 +31,3 @@ fun ViewModelStore.getViewModel(
     return key?.let { provider[key, vmClass] } ?: provider[vmClass]
 }
 
-/**
- * The ViewModelStoreOwner isn't used anywhere in the project, therefore it's not visible for Swift by default.
- */
-@Suppress("unused")
-interface SwiftViewModelStoreOwner : ViewModelStoreOwner