add sharedVM test with params

InsertKoinIO · Jun 11, 2024 · 9902222 · 9902222
1 parent dc6f348
commit 9902222
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 8 deletions.
diff --git a/examples/android-perfs/build.gradle b/examples/android-perfs/build.gradle
@@ -2,8 +2,10 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace = "org.koin.sample.android"
+
     compileSdk android_target_version
-    buildToolsVersion android_build_tools_version
+//    buildToolsVersion android_build_tools_version
 
     defaultConfig {
         minSdkVersion 21
@@ -23,7 +25,7 @@ android {
 dependencies {
     // Koin
     implementation "io.insert-koin:koin-core:$koin_version"
-    implementation "androidx.appcompat:appcompat:1.6.1"
+    implementation "androidx.appcompat:appcompat:1.7.0"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
     implementation project(":jvm-perfs")
 

diff --git a/examples/androidx-samples/build.gradle b/examples/androidx-samples/build.gradle
@@ -12,6 +12,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace = "org.koin.sample.sandbox"
     compileSdk android_target_version
     buildToolsVersion android_build_tools_version
 
@@ -56,7 +57,7 @@ android {
 dependencies {
 
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "androidx.work:work-runtime-ktx:2.8.1"
+    implementation "androidx.work:work-runtime-ktx:2.9.0"
     implementation 'com.squareup.leakcanary:leakcanary-android:2.7'
     testImplementation 'androidx.arch.core:core-testing:2.2.0'
     testImplementation "junit:junit:4.13.2"

diff --git a/examples/androidx-samples/src/main/java/org/koin/sample/sandbox/components/mvvm/SharedVM.kt b/examples/androidx-samples/src/main/java/org/koin/sample/sandbox/components/mvvm/SharedVM.kt
@@ -0,0 +1,6 @@
+package org.koin.sample.sandbox.components.mvvm
+
+import androidx.lifecycle.ViewModel
+import org.koin.sample.sandbox.components.scope.Session
+
+class SharedVM(val session: Session) : ViewModel()
diff --git a/examples/androidx-samples/src/main/java/org/koin/sample/sandbox/di/AppModule.kt b/examples/androidx-samples/src/main/java/org/koin/sample/sandbox/di/AppModule.kt
@@ -74,6 +74,7 @@ val mvvmModule = lazyModule {
 
     viewModelOf(::SavedStateViewModel) { named("vm2") }
 
+    viewModel { (s : Session) -> SharedVM(s)}
     scope<MVVMActivity> {
         scopedOf(::Session)
         fragmentOf(::MVVMFragment) // { MVVMFragment(get()) }

diff --git a/examples/androidx-samples/src/main/java/org/koin/sample/sandbox/mvvm/MVVMActivity.kt b/examples/androidx-samples/src/main/java/org/koin/sample/sandbox/mvvm/MVVMActivity.kt
@@ -35,6 +35,9 @@ class MVVMActivity : ScopeActivity(contentLayoutId = R.layout.mvvm_activity) {
 
     val presenter : FactoryPresenter by inject { parametersOf("_MVVMActivity_id_") }
 
+    val session : Session by inject()
+    val sharedVM : SharedVM by viewModel { parametersOf(session) }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         // should set `lifecycleScope` here because we're
         // using MVVMActivity with scope in mvvmModule (AppModule)
@@ -81,5 +84,7 @@ class MVVMActivity : ScopeActivity(contentLayoutId = R.layout.mvvm_activity) {
         assert(scopeVm2.session.id == scopeVm2.scope.get<Session>().id)
         assert(scopeVm2.scope.get<SessionConsumer>().getSessionId() == scopeVm2.scope.get<Session>().id)
         assert(scopeVm1.session.id != scopeVm2.session.id)
+
+        println("activity sharedVM.session:${sharedVM.session}")
     }
 }
diff --git a/examples/androidx-samples/src/main/java/org/koin/sample/sandbox/mvvm/MVVMFragment.kt b/examples/androidx-samples/src/main/java/org/koin/sample/sandbox/mvvm/MVVMFragment.kt
@@ -16,6 +16,7 @@ import org.koin.core.scope.Scope
 import org.koin.sample.sandbox.R
 import org.koin.sample.sandbox.components.ID
 import org.koin.sample.sandbox.components.mvvm.SavedStateViewModel
+import org.koin.sample.sandbox.components.mvvm.SharedVM
 import org.koin.sample.sandbox.components.mvvm.SimpleViewModel
 import org.koin.sample.sandbox.components.scope.Session
 
@@ -29,6 +30,8 @@ class MVVMFragment(private val session: Session) : Fragment(R.layout.mvvm_fragme
     val saved by viewModel<SavedStateViewModel> { parametersOf(ID) }
     val saved2 by viewModel<SavedStateViewModel> { parametersOf(ID) }
 
+    val sharedVM : SharedVM by activityViewModel()
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -50,5 +53,7 @@ class MVVMFragment(private val session: Session) : Fragment(R.layout.mvvm_fragme
 
         assert(requireScopeActivity<MVVMActivity>().get<Session>().id == getKoin().getProperty("session_id"))
         assert(scope.get<Session>().id == requireScopeActivity<MVVMActivity>().get<Session>().id)
+
+        println("fragment sharedVM.session:${sharedVM.session}")
     }
 }
diff --git a/examples/gradle/versions.gradle b/examples/gradle/versions.gradle
@@ -21,6 +21,6 @@ ext {
     // build Tools
     android_min_version = 14
     android_target_version = 34
-    android_build_tools_version = '33.0.1'
-    android_gradle_version = '7.4.2'
+    android_build_tools_version = '34.0.0'
+    android_gradle_version = '8.4.0'
 }
diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/examples/jvm-perfs/build.gradle.kts b/examples/jvm-perfs/build.gradle.kts
@@ -17,8 +17,8 @@ tasks.getByName<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>("compileKotlin"
 
 val jmhVersion = "1.36"
 //TODO get from existing version.gradle file
-val koin_version = "3.5.3"
-val coroutines_version = "1.7.3"
+val koin_version = "3.6.0-Beta4"
+val coroutines_version = "1.8.0"
 
 dependencies {
     api("io.insert-koin:koin-core:$koin_version")

diff --git a/examples/sample-android-compose/build.gradle b/examples/sample-android-compose/build.gradle
@@ -4,6 +4,7 @@ apply plugin: 'kotlin-android'
 apply from: "../gradle/versions.gradle"
 
 android {
+    namespace = "org.koin.sample.androidx.compose"
     compileSdk android_target_version
     buildToolsVersion '30.0.3'