[Best-Practise-Docs#173] Use new Koin DSL where possible.

app/src/main/java/co/touchlab/kampkit/android/MainApp.kt

@@ -7,7 +7,7 @@ import android.util.Log
 import co.touchlab.kampkit.AppInfo
 import co.touchlab.kampkit.initKoin
 import co.touchlab.kampkit.models.BreedViewModel
-import org.koin.androidx.viewmodel.dsl.viewModel
+import org.koin.androidx.viewmodel.dsl.viewModelOf
 import org.koin.core.parameter.parametersOf
 import org.koin.dsl.module
 
@@ -18,7 +18,9 @@ class MainApp : Application() {
         initKoin(
             module {
                 single<Context> { this@MainApp }
-                viewModel { BreedViewModel(get(), get { parametersOf("BreedViewModel") }) }
+                viewModelOf(::BreedViewModel) {
+                    parametersOf("BreedViewModel")
+                }
                 single<SharedPreferences> {
                     get<Context>().getSharedPreferences("KAMPSTARTER_SETTINGS", Context.MODE_PRIVATE)
                 }

gradle/libs.versions.toml

@@ -32,7 +32,7 @@ kermit = "1.1.3"
 stately = "1.2.3"
 
 accompanist-swiperefresh = "0.25.1"
-koin = "3.2.0"
+koin = "3.3.0"
 multiplatformSettings = "1.0.0-alpha01"
 turbine = "0.12.1"
 sqlDelight = "1.5.3"

shared/src/androidMain/kotlin/co/touchlab/kampkit/KoinAndroid.kt

@@ -7,6 +7,8 @@ import com.squareup.sqldelight.android.AndroidSqliteDriver
 import com.squareup.sqldelight.db.SqlDriver
 import io.ktor.client.engine.okhttp.OkHttp
 import org.koin.core.module.Module
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.bind
 import org.koin.dsl.module
 
 actual val platformModule: Module = module {
@@ -18,9 +20,7 @@ actual val platformModule: Module = module {
         )
     }
 
-    single<Settings> {
-        SharedPreferencesSettings(get())
-    }
+    singleOf(::SharedPreferencesSettings) bind Settings::class
 
     single {
         OkHttp.create()

shared/src/androidTest/kotlin/co/touchlab/kampkit/KoinTest.kt

@@ -2,16 +2,18 @@ package co.touchlab.kampkit
 
 import android.app.Application
 import android.content.Context
+import android.content.SharedPreferences
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import co.touchlab.kermit.Logger
+import co.touchlab.kermit.LoggerConfig
+import kotlinx.coroutines.CoroutineDispatcher
 import org.junit.experimental.categories.Category
 import org.junit.runner.RunWith
+import org.koin.core.annotation.KoinExperimentalAPI
 import org.koin.core.context.stopKoin
-import org.koin.core.parameter.parametersOf
 import org.koin.dsl.module
 import org.koin.test.category.CheckModuleTest
-import org.koin.test.check.checkModules
+import org.koin.test.verify.verify
 import org.robolectric.annotation.Config
 import kotlin.test.AfterTest
 import kotlin.test.Test
@@ -21,18 +23,33 @@ import kotlin.test.Test
 @Config(sdk = [32])
 class KoinTest {
 
+    @OptIn(KoinExperimentalAPI::class)
     @Test
     fun checkAllModules() {
-        initKoin(
-            module {
-                single<Context> { getApplicationContext<Application>() }
-                single { get<Context>().getSharedPreferences("TEST", Context.MODE_PRIVATE) }
-                single<AppInfo> { TestAppInfo }
-                single { {} }
+        val testModule = module {
+            single<Context> { getApplicationContext<Application>() }
+            single<SharedPreferences> {
+                get<Context>().getSharedPreferences(
+                    "TEST",
+                    Context.MODE_PRIVATE
+                )
             }
-        ).checkModules {
-            withParameters<Logger> { parametersOf("TestTag") }
+            single<AppInfo> { TestAppInfo }
+            single { {} }
+
+            includes(
+                platformModule,
+                coreModule
+            )
         }
+        testModule.verify(
+            extraTypes = listOf(
+                Boolean::class,
+                LoggerConfig::class,
+                String::class,
+                CoroutineDispatcher::class
+            )
+        )
     }
 
     @AfterTest

shared/src/commonMain/kotlin/co/touchlab/kampkit/Koin.kt

@@ -13,8 +13,10 @@ import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import org.koin.core.context.startKoin
 import org.koin.core.module.Module
+import org.koin.core.module.dsl.singleOf
 import org.koin.core.parameter.parametersOf
 import org.koin.core.scope.Scope
+import org.koin.dsl.bind
 import org.koin.dsl.module
 
 fun initKoin(appModule: Module): KoinApplication {
@@ -40,20 +42,17 @@ fun initKoin(appModule: Module): KoinApplication {
     return koinApplication
 }
 
-private val coreModule = module {
+val coreModule = module {
     single {
         DatabaseHelper(
             get(),
             getWith("DatabaseHelper"),
             Dispatchers.Default
         )
     }
-    single<DogApi> {
-        DogApiImpl(
-            getWith("DogApiImpl"),
-            get()
-        )
-    }
+    singleOf(::DogApiImpl) {
+        parametersOf("DogApiImpl")
+    } bind DogApi::class
     single<Clock> {
         Clock.System
     }
@@ -65,14 +64,8 @@ private val coreModule = module {
     val baseLogger = Logger(config = StaticConfig(logWriterList = listOf(platformLogWriter())), "KampKit")
     factory { (tag: String?) -> if (tag != null) baseLogger.withTag(tag) else baseLogger }
 
-    single {
-        BreedRepository(
-            get(),
-            get(),
-            get(),
-            getWith("BreedRepository"),
-            get()
-        )
+    singleOf(::BreedRepository) {
+        parametersOf("BreedRepository")
     }
 }
 

shared/src/iosMain/kotlin/co/touchlab/kampkit/KoinIOS.kt

@@ -10,6 +10,7 @@ import io.ktor.client.engine.darwin.Darwin
 import org.koin.core.Koin
 import org.koin.core.KoinApplication
 import org.koin.core.component.KoinComponent
+import org.koin.core.module.dsl.singleOf
 import org.koin.core.parameter.parametersOf
 import org.koin.dsl.module
 import platform.Foundation.NSUserDefaults
@@ -31,7 +32,9 @@ actual val platformModule = module {
 
     single { Darwin.create() }
 
-    single { BreedCallbackViewModel(get(), getWith("BreedCallbackViewModel")) }
+    singleOf(::BreedCallbackViewModel) {
+        parametersOf("BreedCallbackViewModel")
+    }
 }
 
 // Access from Swift to create a logger

shared/src/iosTest/kotlin/co/touchlab/kampkit/KoinTest.kt

@@ -1,23 +1,34 @@
 package co.touchlab.kampkit
 
 import co.touchlab.kermit.Logger
+import com.russhwolf.settings.NSUserDefaultsSettings
+import com.russhwolf.settings.Settings
 import org.koin.core.context.stopKoin
-import org.koin.core.parameter.parametersOf
-import org.koin.test.check.checkModules
+import org.koin.dsl.module
+import org.koin.test.check.checkKoinModules
 import platform.Foundation.NSUserDefaults
 import kotlin.test.AfterTest
 import kotlin.test.Test
 
 class KoinTest {
     @Test
     fun checkAllModules() {
-        initKoinIos(
-            userDefaults = NSUserDefaults.standardUserDefaults,
-            appInfo = TestAppInfo,
-            doOnStartup = { }
-        ).checkModules {
-            withParameters<Logger> { parametersOf("TestTag") }
-        }
+        val modules = listOf(
+            module {
+                single<Settings> { NSUserDefaultsSettings(NSUserDefaults.standardUserDefaults) }
+                single { TestAppInfo }
+                single { }
+            },
+            platformModule,
+            coreModule
+        )
+        checkKoinModules(
+            modules = modules,
+            parameters = {
+                withParameter<Logger> { "Test" }
+                withParameter<Settings> { false }
+            }
+        )
     }
 
     @AfterTest