Fixing issue #787

CHANGELOG.md

@@ -9,6 +9,7 @@ _Core_
 * `[FIXED]` - declare to use reified type
 * `[FIXED]` - Qualifier type as pure string
 * `[FIXED]` - docs contribution
+* `[UPDATED]` - Kotlin 1.3.71
 
 
 _Ktor_

koin-projects/docs/reference/koin-android/viewmodel.md

@@ -190,7 +190,7 @@ val myStateVM: MyStateVM by stateViewModel()
 You can even pass a bundle as state argument:
 
 ```kotlin
-val myStateVM: MyStateVM by stateViewModel(bundle = myBundle)
+val myStateVM: MyStateVM by stateViewModel(bundle = { myBundle })
 ```
 
 

koin-projects/examples/androidx-samples/src/main/java/org/koin/sample/androidx/mvvm/MVVMActivity.kt

@@ -37,12 +37,20 @@ class MVVMActivity : AppCompatActivity() {
     val scopeVm: ExtSimpleViewModel by lifecycleScope.viewModel(this)
     val extScopeVm: ExtSimpleViewModel by lifecycleScope.viewModel(this, named("ext"))
 
-    val savedVm: SavedStateViewModel by stateViewModel { parametersOf("vm1") }
-    val scopedSavedVm: SavedStateViewModel by lifecycleScope.stateViewModel(this, named("vm2")) { parametersOf("vm2") }
+    val bundleStateVm = Bundle().apply { putString("vm1", "value to stateViewModel") }
+    val savedVm: SavedStateViewModel by stateViewModel(bundle = { bundleStateVm }) { parametersOf("vm1") }
+
+    val bundleStateScope = Bundle().apply {
+        putString("vm2", "value to lifecycleScope.stateViewModel")
+    }
+    val scopedSavedVm: SavedStateViewModel by lifecycleScope.stateViewModel(this, named("vm2"), bundle = { bundleStateScope }) {
+        parametersOf("vm2")
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        // if not in scope
-        setupKoinFragmentFactory()
+        // should set `lifecycleScope` here because we're
+        // using MVVMActivity with scope in mvvmModule (AppModule)
+        setupKoinFragmentFactory(lifecycleScope)
 
         super.onCreate(savedInstanceState)
 
@@ -63,6 +71,9 @@ class MVVMActivity : AppCompatActivity() {
         assertNotNull(scopedSavedVm)
         assertNotEquals(savedVm.id, scopedSavedVm.id)
 
+        assertEquals("value to stateViewModel", savedVm.handle.get("vm1"))
+        assertEquals("value to lifecycleScope.stateViewModel", scopedSavedVm.handle.get("vm2"))
+
         supportFragmentManager.beginTransaction()
             .replace(R.id.mvvm_frame, MVVMFragment::class.java, null, null)
             .commit()

koin-projects/gradle/versions.gradle

@@ -3,7 +3,7 @@ ext {
     koin_version = '2.1.5'
 
     // Kotlin
-    kotlin_version = '1.3.70'
+    kotlin_version = '1.3.71'
     coroutines_version = "1.3.3"
 
     // Dokka

koin-projects/koin-androidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/ViewModelParameter.kt

@@ -15,3 +15,5 @@ class ViewModelParameter<T : Any>(
         val viewModelStore: ViewModelStore,
         val stateRegistryOwner: SavedStateRegistryOwner? = null
 )
+
+typealias StateBundleParameter = () -> Bundle

koin-projects/koin-androidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/ext/android/SavedStateRegistryOwnerExt.kt

@@ -21,6 +21,7 @@ import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.ViewModel
 import androidx.savedstate.SavedStateRegistryOwner
 import org.koin.android.ext.android.getKoin
+import org.koin.androidx.viewmodel.StateBundleParameter
 import org.koin.androidx.viewmodel.koin.getStateViewModel
 import org.koin.core.parameter.ParametersDefinition
 import org.koin.core.qualifier.Qualifier
@@ -43,10 +44,10 @@ fun <T : ViewModel> SavedStateRegistryOwner.stateViewModel(
 
 inline fun <reified T : ViewModel> SavedStateRegistryOwner.stateViewModel(
     qualifier: Qualifier? = null,
-    bundle: Bundle? = null,
+    noinline bundle: StateBundleParameter? = null,
     noinline parameters: ParametersDefinition? = null
 ): Lazy<T> {
-    return lazy(LazyThreadSafetyMode.NONE) { getStateViewModel(T::class, qualifier, bundle, parameters) }
+    return lazy(LazyThreadSafetyMode.NONE) { getStateViewModel(T::class, qualifier, bundle?.invoke(), parameters) }
 }
 
 inline fun <reified T : ViewModel> SavedStateRegistryOwner.getStateViewModel(

koin-projects/koin-androidx-viewmodel/src/main/java/org/koin/androidx/viewmodel/scope/ScopeStateVMExt.kt

@@ -20,6 +20,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelStore
 import androidx.lifecycle.ViewModelStoreOwner
 import androidx.savedstate.SavedStateRegistryOwner
+import org.koin.androidx.viewmodel.StateBundleParameter
 import org.koin.androidx.viewmodel.ViewModelParameter
 import org.koin.core.parameter.ParametersDefinition
 import org.koin.core.qualifier.Qualifier
@@ -71,10 +72,10 @@ private fun SavedStateRegistryOwner.getViewModelStore(): ViewModelStore {
 inline fun <reified T : ViewModel> Scope.stateViewModel(
     owner: SavedStateRegistryOwner,
     qualifier: Qualifier? = null,
-    bundle: Bundle? = null,
+    noinline bundle: StateBundleParameter? = null,
     noinline parameters: ParametersDefinition? = null
 ): Lazy<T> {
-    return lazy(LazyThreadSafetyMode.NONE) { getStateViewModel(owner, T::class, qualifier, bundle, parameters) }
+    return lazy(LazyThreadSafetyMode.NONE) { getStateViewModel(owner, T::class, qualifier, bundle?.invoke(), parameters) }
 }
 
 fun <T : ViewModel> Scope.stateViewModel(

koin-projects/koin-ktor/src/main/kotlin/org/koin/ktor/ext/KoinFeature.kt

@@ -74,6 +74,5 @@ fun Application.koin(configuration: KoinAppDeclaration) = featureOrNull(Koin)?.a
  *
  * Gets or installs a [Koin] feature for the this [Application] and install a [block] modules on it
  */
-@KoinExperimentalAPI
 @ContextDsl
 fun Application.modules(vararg block: Module) = koin { modules(block.asList()) }