add koin to multiplatform shared code

app/src/main/java/com/surrus/peopleinspace/PeopleInSpaceApplication.kt

@@ -1,11 +1,12 @@
 package com.surrus.peopleinspace
 
 import android.app.Application
+import com.surrus.common.di.commonModule
+import com.surrus.common.di.initKoin
 import com.surrus.common.repository.appContext
 import com.surrus.peopleinspace.di.appModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
-import org.koin.core.context.startKoin
 
 class PeopleInSpaceApplication : Application() {
 
@@ -14,10 +15,10 @@ class PeopleInSpaceApplication : Application() {
 
         appContext = this
 
-        startKoin {
+        initKoin {
             androidLogger()
             androidContext(this@PeopleInSpaceApplication)
-            modules(appModule)
+            modules(appModule, commonModule)
         }
     }
 }

app/src/main/java/com/surrus/peopleinspace/di/AppModule.kt

@@ -1,13 +1,9 @@
 package com.surrus.peopleinspace.di
 
-import com.surrus.common.repository.PeopleInSpaceRepository
 import com.surrus.peopleinspace.ui.PeopleInSpaceViewModel
 import org.koin.android.viewmodel.dsl.viewModel
 import org.koin.dsl.module
 
 val appModule = module {
-
     viewModel { PeopleInSpaceViewModel(get()) }
-
-    single { PeopleInSpaceRepository() }
 }

build.gradle.kts

@@ -19,6 +19,7 @@ allprojects {
         google()
         mavenCentral()
         jcenter()
+        maven( "https://dl.bintray.com/ekito/koin")
         maven("https://kotlin.bintray.com/kotlin-js-wrappers/")
     }
 }

buildSrc/src/main/java/Dependencies.kt

@@ -4,7 +4,7 @@ object Versions {
 
     const val kotlin = "1.3.71"
     const val kotlinCoroutines = "1.3.5-native-mt"
-    const val koin = "2.1.2"
+    const val koin = "3.0.0-alpha-2"
     const val ktor = "1.3.2"
     const val kotlinxSerialization = "0.20.0"
     const val sqlDelight = "1.3.0"

common/build.gradle.kts

@@ -84,6 +84,8 @@ kotlin {
                 implementation("com.squareup.sqldelight:runtime:${Versions.sqlDelight}")
                 implementation("com.squareup.sqldelight:coroutines-extensions:${Versions.sqlDelight}")
 
+                // koin
+                implementation("org.koin:koin-core:${Versions.koin}")
             }
         }
 

common/src/commonMain/kotlin/com/surrus/common/di/Koin.kt

@@ -0,0 +1,20 @@
+package com.surrus.common.di
+
+import com.surrus.common.remote.PeopleInSpaceApi
+import com.surrus.common.repository.PeopleInSpaceRepository
+import org.koin.core.context.startKoin
+import org.koin.dsl.KoinAppDeclaration
+import org.koin.dsl.module
+
+fun initKoin(appDeclaration: KoinAppDeclaration = {}) = startKoin {
+    appDeclaration()
+    modules(commonModule)
+}
+
+// called by iOS etc
+fun initKoin() = initKoin{}
+
+val commonModule = module {
+    single { PeopleInSpaceRepository() }
+    single { PeopleInSpaceApi() }
+}

common/src/commonMain/kotlin/com/surrus/common/repository/PeopleInSpaceRepository.kt

@@ -8,15 +8,17 @@ import com.surrus.common.remote.PeopleInSpaceApi
 import com.surrus.peopleinspace.db.PeopleInSpaceDatabase
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.collect
+import org.koin.core.KoinComponent
+import org.koin.core.inject
 
 expect fun createDb() : PeopleInSpaceDatabase?
 
 // TEMP until following is resolved https://github.com/ktorio/ktor/issues/1622
 expect fun ktorScope(block: suspend () -> Unit)
 
 
-class PeopleInSpaceRepository {
-    private val peopleInSpaceApi = PeopleInSpaceApi()
+class PeopleInSpaceRepository() : KoinComponent {
+    private val peopleInSpaceApi: PeopleInSpaceApi by inject()
     private val peopleInSpaceDatabase = createDb()
     private val peopleInSpaceQueries = peopleInSpaceDatabase?.peopleInSpaceQueries
 

ios/PeopleInSpaceSwiftUI/PeopleInSpaceSwiftUI/AppDelegate.swift

@@ -1,12 +1,13 @@
 import UIKit
+import common
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
 
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        // Override point for customization after application launch.
+        KoinKt.doInitKoin()
         return true
     }
 

macOS/PeopleInSpace/PeopleInSpace/AppDelegate.swift

@@ -8,6 +8,7 @@
 
 import Cocoa
 import SwiftUI
+import common
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
@@ -16,6 +17,8 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
+        KoinKt.doInitKoin()
+
         // Create the SwiftUI view that provides the window contents.
         let contentView = ContentView()
 

watchos/PeopleInSpaceWatch/PeopleInSpaceWatch WatchKit Extension/ExtensionDelegate.swift

@@ -4,11 +4,12 @@
 //
 
 import WatchKit
+import common
 
 class ExtensionDelegate: NSObject, WKExtensionDelegate {
 
     func applicationDidFinishLaunching() {
-        // Perform any final initialization of your application.
+        KoinKt.doInitKoin()
     }
 
     func applicationDidBecomeActive() {