move to multiplatform viewmodel

README.md

@@ -11,7 +11,7 @@ A multiplatform Dependency Injection library.
 
 | Artifact                  | Description                                                                                                                                    |
 |---------------------------|------------------------------------------------------------------------------------------------------------------------------------------------|
-| kinject                   | Provides core DI functionality.                                                                                                                |
+| kinject-core              | Provides core DI functionality.                                                                                                                |
 | kinject-android           | Provides helper methods for working with `ObjectGraph`s embedded in `Context`s, and helper classes for embedding `ObjectGraph`s in `Contexts`. |
 | kinject-android-appcompat | Provides `KinjectAppCompatActivity`.                                                                                                           |
 | kinject-android-compose   | Provides `KinjectComponentActivity`.                                                                                                           |

build.gradle.kts

@@ -8,10 +8,10 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
-    alias(libs.plugins.gradleMavenPublish) apply false
-    alias(libs.plugins.android.application) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.compose) apply false
+    alias(libs.plugins.gradleMavenPublish) apply false
+    alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.androidx.benchmark) apply false
 }

gradle.properties

@@ -1,5 +1,6 @@
 org.gradle.jvmargs=-Xmx3g -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2g"
 
 kotlin.code.style=official
+kotlin.mpp.androidGradlePluginCompatibility.nowarn=true
 
 android.useAndroidX=true

gradle/libs.versions.toml

@@ -7,14 +7,15 @@ kotlinxBenchmark = "0.4.10"
 androidx-benchmark = "1.2.4"
 runner = "1.6.1"
 benchmarkJunit4 = "1.2.4"
-lifecycleViewmodel = "2.8.2"
+androidx-lifecycle = "2.8.3"
 compose-bom = "2024.06.00"
 compose-compiler = "1.5.14"
 coreKtx = "1.13.1"
 espressoCore = "3.6.1"
-lifecycleRuntimeKtx = "2.8.2"
+lifecycleRuntimeKtx = "2.8.3"
 activityCompose = "1.9.0"
 appcompat = "1.7.0"
+jetbrains-androidx-lifecycle = "2.8.0"
 
 [libraries]
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
@@ -26,8 +27,11 @@ compose-runtime = { group = "androidx.compose.runtime", name = "runtime", versio
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 koin-core = { module = "io.insert-koin:koin-core", version = "3.5.6" }
 kotlinx-benchmark = { module = "org.jetbrains.kotlinx:kotlinx-benchmark-runtime", version.ref = "kotlinxBenchmark" }
-androidx-lifecycle-viewmodel-android = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-android", version.ref = "lifecycleViewmodel" }
-androidx-lifecycle-viewmodel-compose = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-compose-android", version.ref = "lifecycleViewmodel" }
+androidx-lifecycle-viewmodel = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "androidx-lifecycle" }
+androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "androidx-lifecycle" }
+jetbrains-androidx-lifecycle-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel", version.ref = "jetbrains-androidx-lifecycle" }
+jetbrains-androidx-lifecycle-viewmodel-compose = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "jetbrains-androidx-lifecycle" }
+
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 androidx-lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }

kinject-android/src/main/kotlin/kinject/android/ContextExt.kt

@@ -1,8 +1,10 @@
 package kinject.android
 
+import android.annotation.SuppressLint
 import android.content.Context
 import kinject.ObjectGraph
 
+@SuppressLint("WrongConstant")
 fun Context.objectGraphOrNull(): ObjectGraph? {
     return getSystemService(KinjectApplication.KINJECT_SERVICE) as ObjectGraph?
 }

kinject-compose-viewmodel/build.gradle.kts

@@ -7,17 +7,10 @@ plugins {
 
 android {
     namespace = "kinject.compose.viewmodel"
-
-    buildFeatures {
-        compose = true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
 }
 
 dependencies {
     api(project(":kinject-compose"))
     api(project(":kinject-viewmodel"))
-    implementation(libs.androidx.lifecycle.viewmodel.compose)
+    api(libs.androidx.lifecycle.viewmodel.compose)
 }

kinject-compose/build.gradle.kts

@@ -7,13 +7,6 @@ plugins {
 
 android {
     namespace = "kinject.compose"
-
-    buildFeatures {
-        compose = true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
 }
 
 composeCompiler {

kinject-core/build.gradle.kts

@@ -1,5 +1,3 @@
-@file:OptIn(ExperimentalWasmDsl::class)
-
 import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
@@ -19,8 +17,6 @@ kotlin {
             }
         }
     }
-    wasmJs()
-    wasmWasi()
     macosArm64()
     macosX64()
     iosX64()

kinject-viewmodel/build.gradle.kts

@@ -1,14 +1,28 @@
 plugins {
+    alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
-    alias(libs.plugins.kotlin.android)
     alias(libs.plugins.gradleMavenPublish)
 }
 
-android {
-    namespace = "kinject.viewmodel"
+kotlin {
+    jvm()
+    androidTarget()
+    macosArm64()
+    macosX64()
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+
+    applyDefaultHierarchyTemplate()
+
+    sourceSets {
+        commonMain.dependencies {
+            api(project(":kinject-core"))
+            implementation(libs.androidx.lifecycle.viewmodel)
+        }
+    }
 }
 
-dependencies {
-    api(project(":kinject-core"))
-    implementation(libs.androidx.lifecycle.viewmodel.android)
+android {
+    namespace = "kinject.viewmodel"
 }

kinject-viewmodel/src/main/kotlin/kinject/viewmodel/KinjectViewModelFactory.kt → kinject-viewmodel/src/commonMain/kotlin/kinject/viewmodel/KinjectViewModelFactory.kt

@@ -2,11 +2,14 @@ package kinject.viewmodel
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.viewmodel.CreationExtras
 import kinject.ObjectGraph
-import kinject.get
+import kotlin.reflect.KClass
 
 class KinjectViewModelFactory(
     private val objectGraph: ObjectGraph,
 ) : ViewModelProvider.Factory {
-    override fun <T : ViewModel> create(modelClass: Class<T>): T = objectGraph.get(modelClass)
+    override fun <T : ViewModel> create(modelClass: KClass<T>, extras: CreationExtras): T {
+        return objectGraph.get(modelClass)
+    }
 }