[SHARED] Update koin

kamgurgul · Jul 26, 2024 · 290ebce · 290ebce
1 parent 856ee6f
commit 290ebce
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 28 deletions.
diff --git a/androidApp/src/androidMain/kotlin/com/kgurgul/cpuinfo/CpuInfoApp.kt b/androidApp/src/androidMain/kotlin/com/kgurgul/cpuinfo/CpuInfoApp.kt
@@ -19,13 +19,8 @@ package com.kgurgul.cpuinfo
 import android.app.Application
 import com.kgurgul.cpuinfo.appinitializers.AppInitializerComponent
 import com.kgurgul.cpuinfo.appinitializers.AppInitializersModule
-import com.kgurgul.cpuinfo.components.ComponentsModule
-import com.kgurgul.cpuinfo.data.DataModule
 import com.kgurgul.cpuinfo.di.androidModule
-import com.kgurgul.cpuinfo.di.viewModelModule
-import com.kgurgul.cpuinfo.domain.DomainModule
-import com.kgurgul.cpuinfo.features.FeaturesModule
-import com.kgurgul.cpuinfo.utils.UtilsModule
+import com.kgurgul.cpuinfo.di.sharedModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 import org.koin.ksp.generated.module
@@ -39,12 +34,7 @@ class CpuInfoApp : Application() {
             modules(
                 androidModule,
                 AppInitializersModule().module,
-                ComponentsModule().module,
-                DataModule().module,
-                DomainModule().module,
-                FeaturesModule().module,
-                UtilsModule().module,
-                viewModelModule,
+                sharedModule,
             )
         }
         AppInitializerComponent().init(this)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,9 +19,8 @@ composeUiTest = "1.6.8"
 composeMultiplatform = "1.7.0-alpha01"
 dependencyUpdate = "0.51.0"
 kermit = "2.0.4"
-koin = "3.6.0-Beta5"
+koin = "4.0.0-RC1"
 koinAnnotations = "1.3.1"
-koinComposeViewModel = "1.2.0-Beta5"
 kotlin = "2.0.0"
 kotlinxCoroutines = "1.9.0-RC"
 kotlinxImmutable = "0.3.7"
@@ -58,7 +57,7 @@ compose-ui-testManifest = { module = "androidx.compose.ui:ui-test-manifest", ver
 kermit-kermit = { module = "co.touchlab:kermit", version.ref = "kermit" }
 koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
 koin-annotations = { module = "io.insert-koin:koin-annotations", version.ref = "koinAnnotations" }
-koin-compose-viewodel = { module = "io.insert-koin:koin-compose-viewmodel", version.ref = "koinComposeViewModel" }
+koin-compose-viewodel = { module = "io.insert-koin:koin-compose-viewmodel", version.ref = "koin" }
 koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
 koin-kspCompiler = { module = "io.insert-koin:koin-ksp-compiler", version.ref = "koinAnnotations" }
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" }

diff --git a/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/di/SharedModule.kt b/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/di/SharedModule.kt
@@ -0,0 +1,20 @@
+package com.kgurgul.cpuinfo.di
+
+import com.kgurgul.cpuinfo.components.ComponentsModule
+import com.kgurgul.cpuinfo.data.DataModule
+import com.kgurgul.cpuinfo.domain.DomainModule
+import com.kgurgul.cpuinfo.features.FeaturesModule
+import com.kgurgul.cpuinfo.utils.UtilsModule
+import org.koin.dsl.module
+import org.koin.ksp.generated.module
+
+val sharedModule = module {
+    includes(
+        ComponentsModule().module,
+        DataModule().module,
+        DomainModule().module,
+        FeaturesModule().module,
+        UtilsModule().module,
+        viewModelModule,
+    )
+}
diff --git a/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/di/ViewModelModule.kt b/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/di/ViewModelModule.kt
@@ -14,7 +14,7 @@ import com.kgurgul.cpuinfo.features.information.storage.StorageInfoViewModel
 import com.kgurgul.cpuinfo.features.processes.ProcessesViewModel
 import com.kgurgul.cpuinfo.features.settings.SettingsViewModel
 import com.kgurgul.cpuinfo.features.temperature.TemperatureViewModel
-import org.koin.compose.viewmodel.dsl.viewModelOf
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 
 val viewModelModule = module {

diff --git a/shared/src/iosMain/kotlin/com/kgurgul/cpuinfo/di/Injector.kt b/shared/src/iosMain/kotlin/com/kgurgul/cpuinfo/di/Injector.kt
@@ -1,28 +1,17 @@
 package com.kgurgul.cpuinfo.di
 
-import com.kgurgul.cpuinfo.components.ComponentsModule
-import com.kgurgul.cpuinfo.data.DataModule
 import com.kgurgul.cpuinfo.data.provider.IosHardwareDataProvider
 import com.kgurgul.cpuinfo.data.provider.IosSoftwareDataProvider
-import com.kgurgul.cpuinfo.domain.DomainModule
-import com.kgurgul.cpuinfo.features.FeaturesModule
-import com.kgurgul.cpuinfo.utils.UtilsModule
 import org.koin.core.context.startKoin
-import org.koin.ksp.generated.module
 
 fun initKoin(
     iosHardwareDataProvider: IosHardwareDataProvider,
     iosSoftwareDataProvider: IosSoftwareDataProvider,
 ) {
     startKoin {
         modules(
-            ComponentsModule().module,
-            DataModule().module,
-            DomainModule().module,
-            FeaturesModule().module,
             iosModule(iosHardwareDataProvider, iosSoftwareDataProvider),
-            UtilsModule().module,
-            viewModelModule,
+            sharedModule,
         )
     }
 }