Migrate to Kotlin inject

androidbroadcast · Oct 7, 2024 · c60c9a6 · c60c9a6
1 parent 4245e29
commit c60c9a6
Show file tree

Hide file tree

Showing 31 changed files with 96 additions and 93 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -90,7 +90,6 @@ dependencies {
     implementation(projects.core.platform)
 
     implementation(projects.composeApp)
-    implementation(libs.koin.android)
     implementation(libs.coil.core)
     implementation(projects.core.common)
 }
diff --git a/app/src/main/kotlin/dev/androidbroadcast/newssearchapp/NewsApplication.kt b/app/src/main/kotlin/dev/androidbroadcast/newssearchapp/NewsApplication.kt
@@ -3,7 +3,6 @@ package dev.androidbroadcast.newssearchapp
 import android.app.Application
 import coil3.SingletonImageLoader
 import dev.androidbroadcast.news.core.NewsAppPlatform
-import org.koin.android.ext.koin.androidContext
 
 class NewsApplication @JvmOverloads constructor(
     private val platform: NewsAppPlatform = NewsAppPlatform()

diff --git a/compose-app/build.gradle.kts b/compose-app/build.gradle.kts
@@ -24,7 +24,6 @@ kotlin {
     jvm()
 
     listOf(
-        iosX64(),
         iosArm64(),
         iosSimulatorArm64()
     ).forEach { iosTarget ->
@@ -39,7 +38,6 @@ kotlin {
             implementation(projects.features.newsMain.ui)
             implementation(projects.core.common)
             implementation(projects.core.uikit)
-            implementation(libs.koin.compose)
         }
     }
 }

diff --git a/compose-app/src/androidMain/kotlin/dev/androidbroadcast/news/compose/NewsApp.android.kt b/compose-app/src/androidMain/kotlin/dev/androidbroadcast/news/compose/NewsApp.android.kt
@@ -5,7 +5,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalView
-import androidx.core.view.WindowCompat
 import dev.androidbroadcast.news.NewsTheme
 
 @Composable
@@ -19,7 +18,7 @@ internal actual fun NewsPlatformTheme(
         SideEffect {
             val window = (view.context as Activity).window
             window.statusBarColor = colorScheme.primary.toArgb()
-            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
+//            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
         }
     }
     content()

diff --git a/compose-app/src/commonMain/kotlin/dev/androidbroadcast/news/compose/NewsApp.kt b/compose-app/src/commonMain/kotlin/dev/androidbroadcast/news/compose/NewsApp.kt
@@ -8,7 +8,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import dev.androidbroadcast.news.NewsTheme
 import dev.androidbroadcast.news.main.NewsMainScreen
-import org.koin.compose.KoinContext
 
 /**
  * Setup theme for platform
@@ -29,9 +28,7 @@ public fun NewsApp() {
                 modifier = Modifier.fillMaxSize(),
                 color = MaterialTheme.colorScheme.background
             ) {
-                KoinContext {
-                    NewsMainScreen()
-                }
+                NewsMainScreen()
             }
         }
     }

diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -21,7 +21,6 @@ kotlin {
     jvm()
 
     listOf(
-        iosX64(),
         iosArm64(),
         iosSimulatorArm64()
     ).forEach { iosTarget ->
@@ -37,15 +36,13 @@ kotlin {
             api(libs.kotlinx.immutable)
             api(libs.kotlinx.datetime)
             api(libs.coil.core)
-            api(libs.koin.core)
             api(libs.kotlinInject.runtime)
             implementation(libs.coil.network.ktor)
         }
 
         androidMain.dependencies {
             implementation(libs.androidx.core.ktx)
             api(libs.kotlinx.coroutines.android)
-            api(libs.koin.android)
         }
 
         jvmMain.dependencies {

diff --git a/core/data/build.gradle.kts b/core/data/build.gradle.kts
@@ -21,7 +21,6 @@ kotlin {
     jvm()
 
     listOf(
-        iosX64(),
         iosArm64(),
         iosSimulatorArm64()
     ).forEach { iosTarget ->

diff --git a/core/data/src/commonMain/kotlin/dev/androidbroadcast/news/data/ArticlesRepository.kt b/core/data/src/commonMain/kotlin/dev/androidbroadcast/news/data/ArticlesRepository.kt
@@ -21,7 +21,6 @@ import kotlinx.coroutines.flow.onEach
 import me.tatarka.inject.annotations.Inject
 
 @Inject
-@Singleton
 public class ArticlesRepository(
     private val database: NewsDatabase,
     private val api: NewsApi,

diff --git a/core/database/build.gradle.kts b/core/database/build.gradle.kts
@@ -20,7 +20,6 @@ kotlin {
     jvm()
 
     listOf(
-        iosX64(),
         iosArm64(),
         iosSimulatorArm64()
     ).forEach { iosTarget ->
@@ -81,7 +80,6 @@ dependencies {
     add("kspJvm", libs.androidx.room.compiler)
     add("kspAndroid", libs.androidx.room.compiler)
     add("kspIosSimulatorArm64", libs.androidx.room.compiler)
-    add("kspIosX64", libs.androidx.room.compiler)
     add("kspIosArm64", libs.androidx.room.compiler)
 //    add("kspCommonMainMetadata", libs.androidx.room.compiler)
 }
diff --git a/core/opennews-api/build.gradle.kts b/core/opennews-api/build.gradle.kts
@@ -19,7 +19,6 @@ kotlin {
     jvm()
 
     listOf(
-        iosX64(),
         iosArm64(),
         iosSimulatorArm64()
     ).forEach { iosTarget ->

diff --git a/core/platform/build.gradle.kts b/core/platform/build.gradle.kts
@@ -22,7 +22,6 @@ kotlin {
     jvm()
 
     listOf(
-        iosX64(),
         iosArm64(),
         iosSimulatorArm64()
     ).forEach { iosTarget ->
@@ -66,12 +65,7 @@ android {
 }
 
 dependencies {
-    // 1. Configure code generation into the common source set
-    kspCommonMainMetadata(libs.kotlinInject.compiler)
-
-    // 2. Configure code generation into each KMP target source set
     "kspAndroid"(libs.kotlinInject.compiler)
-    "kspIosX64"(libs.kotlinInject.compiler)
     "kspIosArm64"(libs.kotlinInject.compiler)
     "kspIosSimulatorArm64"(libs.kotlinInject.compiler)
     "kspJvm"(libs.kotlinInject.compiler)

diff --git a/core/platform/src/androidMain/kotlin/dev/androidbroadcast/news/core/AppComponent.android.kt b/core/platform/src/androidMain/kotlin/dev/androidbroadcast/news/core/AppComponent.android.kt
@@ -6,7 +6,6 @@ import dev.androidbroadcast.common.AndroidLogcatLogger
 import dev.androidbroadcast.common.Logger
 import dev.androidbroadcast.common.PlatformContext
 import dev.androidbroadcast.news.database.NewsRoomDatabase
-import org.koin.android.ext.koin.androidContext
 
 internal actual fun newsRoomDatabaseBuilder(context: PlatformContext): RoomDatabase.Builder<NewsRoomDatabase> {
     return Room.databaseBuilder(
@@ -17,3 +16,12 @@ internal actual fun newsRoomDatabaseBuilder(context: PlatformContext): RoomDatab
 }
 
 internal actual fun newLogger(): Logger = AndroidLogcatLogger()
+
+internal actual fun createAppComponent(
+    debuggable: Boolean,
+    baseUrl: String,
+    apiKey: String,
+    platformContext: PlatformContext
+): AppComponent {
+    return AppComponent::class.create(debuggable, baseUrl, apiKey, platformContext)
+}
diff --git a/core/platform/src/commonMain/kotlin/dev/androidbroadcast/news/core/AppComponent.kt b/core/platform/src/commonMain/kotlin/dev/androidbroadcast/news/core/AppComponent.kt
@@ -6,20 +6,20 @@ import dev.androidbroadcast.common.Logger
 import dev.androidbroadcast.common.Named
 import dev.androidbroadcast.common.PlatformContext
 import dev.androidbroadcast.common.Singleton
+import dev.androidbroadcast.news.data.ArticlesRepository
 import dev.androidbroadcast.news.database.NewsDatabase
 import dev.androidbroadcast.news.database.NewsRoomDatabase
 import dev.androidbroadcast.newsapi.NewsApi
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import me.tatarka.inject.annotations.Component
-import me.tatarka.inject.annotations.KmpComponentCreate
 import me.tatarka.inject.annotations.Provides
+import kotlin.properties.Delegates.notNull
 
-@KmpComponentCreate
 internal expect fun createAppComponent(
-//    debuggable: Boolean,
-//    baseUrl: String,
-//    apiKey: String,
+    debuggable: Boolean,
+    baseUrl: String,
+    apiKey: String,
     platformContext: PlatformContext,
 ): AppComponent
 
@@ -30,16 +30,20 @@ internal expect fun newLogger(): Logger
 @Component
 @Singleton
 public abstract class AppComponent(
-//    @get:[Provides Named(ConfigProperties.NewsPlatform.Debug)] public val debuggable: Boolean,
-//    @get:[Provides Named(ConfigProperties.NewsApi.BaseUrl)] protected val baseUrl: String,
-//    @get:[Provides Named(ConfigProperties.NewsApi.ApiKey)] protected val apiKey: String,
+    @get:[Provides Named(ConfigProperties.NewsPlatform.Debug)] public val debuggable: Boolean,
+    @get:[Provides Named(ConfigProperties.NewsApi.BaseUrl)] protected val baseUrl: String,
+    @get:[Provides Named(ConfigProperties.NewsApi.ApiKey)] protected val apiKey: String,
     @get:Provides protected val platformContext: PlatformContext,
 ) {
 
+    public abstract val articlesRepository: ArticlesRepository
+
+    public abstract val newsDatabase: NewsDatabase
+
     @ExperimentalSerializationApi
     @Singleton
     @Provides
-    public fun json(): Json {
+    internal fun providesJson(): Json {
         return Json {
             isLenient = true
             ignoreUnknownKeys = true
@@ -49,7 +53,7 @@ public abstract class AppComponent(
 
     @Singleton
     @Provides
-    public fun newsApi(
+    internal fun providesNewsApi(
         json: Json,
     ): NewsApi {
         return NewsApi(
@@ -61,11 +65,11 @@ public abstract class AppComponent(
 
     @Singleton
     @Provides
-    public fun appDispatchers(): AppDispatchers = AppDispatchers()
+    internal fun providesAppDispatchers(): AppDispatchers = AppDispatchers()
 
     @Singleton
     @Provides
-    public fun newsDatabase(
+    internal fun providesNewsDatabase(
         dispatchers: AppDispatchers,
         context: PlatformContext,
     ): NewsDatabase {
@@ -77,24 +81,20 @@ public abstract class AppComponent(
 
     @Singleton
     @Provides
-    public fun logger(): Logger = newLogger()
+    internal fun providesLogger(): Logger = newLogger()
 
     public companion object {
 
-        public val appComponent: AppComponent
-            get() = checkNotNull(_appComponent)
-
-        private var _appComponent: AppComponent? = null
+        public var appComponent: AppComponent by notNull()
+            private set
 
         internal fun create(
-//            debuggable: Boolean,
-//            baseUrl: String,
-//            apiKey: String,
+            debuggable: Boolean,
+            baseUrl: String,
+            apiKey: String,
             platformContext: PlatformContext,
         ): AppComponent {
-            this._appComponent = createAppComponent(
-//                debuggable, baseUrl, apiKey,
-                platformContext)
+            appComponent = createAppComponent(debuggable, baseUrl, apiKey, platformContext)
             return appComponent
         }
     }

diff --git a/core/platform/src/commonMain/kotlin/dev/androidbroadcast/news/core/NewsAppPlatform.kt b/core/platform/src/commonMain/kotlin/dev/androidbroadcast/news/core/NewsAppPlatform.kt
@@ -18,8 +18,9 @@ public class NewsAppPlatform :
         platformContext: PlatformContext,
     ) {
         appComponent = AppComponent.create(
-//            debug, newsApiBaseUrl, newsApiKey,
-            platformContext)
+            debug, newsApiBaseUrl, newsApiKey,
+            platformContext
+        )
     }
 
     override fun newImageLoader(context: coil3.PlatformContext): ImageLoader {

diff --git a/.../platform/src/iosArm64Main/kotlin/dev/androidbroadcast/news/core/AppComponent.iosArm64.kt b/.../platform/src/iosArm64Main/kotlin/dev/androidbroadcast/news/core/AppComponent.iosArm64.kt
@@ -0,0 +1,12 @@
+package dev.androidbroadcast.news.core
+
+import dev.androidbroadcast.common.PlatformContext
+
+internal actual fun createAppComponent(
+    debuggable: Boolean,
+    baseUrl: String,
+    apiKey: String,
+    platformContext: PlatformContext
+): AppComponent {
+    return AppComponent::class.create(debuggable, baseUrl, apiKey, platformContext)
+}
diff --git a/...imulatorArm64Main/kotlin/dev/androidbroadcast/news/core/AppComponent.iosSimulatorArm64.kt b/...imulatorArm64Main/kotlin/dev/androidbroadcast/news/core/AppComponent.iosSimulatorArm64.kt
@@ -0,0 +1,12 @@
+package dev.androidbroadcast.news.core
+
+import dev.androidbroadcast.common.PlatformContext
+
+internal actual fun createAppComponent(
+    debuggable: Boolean,
+    baseUrl: String,
+    apiKey: String,
+    platformContext: PlatformContext
+): AppComponent {
+    return AppComponent::class.create(debuggable, baseUrl, apiKey, platformContext)
+}
diff --git a/core/platform/src/jvmMain/kotlin/dev/androidbroadcast/news/core/AppComponent.jvm.kt b/core/platform/src/jvmMain/kotlin/dev/androidbroadcast/news/core/AppComponent.jvm.kt
@@ -16,3 +16,12 @@ internal actual fun newsRoomDatabaseBuilder(context: PlatformContext): RoomDatab
 }
 
 internal actual fun newLogger(): Logger = PrintLogger()
+
+internal actual fun createAppComponent(
+    debuggable: Boolean,
+    baseUrl: String,
+    apiKey: String,
+    platformContext: PlatformContext
+): AppComponent {
+    return AppComponent::class.create(debuggable, baseUrl, apiKey, platformContext)
+}
diff --git a/core/uikit/build.gradle.kts b/core/uikit/build.gradle.kts
@@ -21,7 +21,6 @@ kotlin {
     jvm()
 
     listOf(
-        iosX64(),
         iosArm64(),
         iosSimulatorArm64()
     ).forEach { iosTarget ->

diff --git a/features/news-main/ui-logic/build.gradle.kts b/features/news-main/ui-logic/build.gradle.kts
@@ -22,7 +22,6 @@ kotlin {
     jvm()
 
     listOf(
-        iosX64(),
         iosArm64(),
         iosSimulatorArm64()
     ).forEach { iosTarget ->
@@ -38,15 +37,12 @@ kotlin {
             api(projects.core.common)
             implementation(libs.androidx.lifecycle.runtime)
             implementation(libs.androidx.lifecycle.viewmodel)
-            api(libs.koin.compose.viewmodel)
 
             implementation(projects.core.platform)
         }
 
         androidMain.dependencies {
             implementation(libs.androidx.core.ktx)
-            api(libs.koin.androidx.compose)
-            api(libs.koin.android)
         }
     }
 }
@@ -82,7 +78,6 @@ dependencies {
 
     // 2. Configure code generation into each KMP target source set
     "kspAndroid"(libs.kotlinInject.compiler)
-    "kspIosX64"(libs.kotlinInject.compiler)
     "kspIosArm64"(libs.kotlinInject.compiler)
     "kspIosSimulatorArm64"(libs.kotlinInject.compiler)
     "kspJvm"(libs.kotlinInject.compiler)

diff --git a/...gic/src/androidMain/kotlin/dev/androidbroadcast/news/main/di/NewsMainComponent.android.kt b/...gic/src/androidMain/kotlin/dev/androidbroadcast/news/main/di/NewsMainComponent.android.kt
@@ -2,6 +2,6 @@ package dev.androidbroadcast.news.main.di
 
 import dev.androidbroadcast.news.core.AppComponent
 
-actual fun createNewsMainComponent(): NewsMainComponent {
-    return NewsMainComponent::class.create(AppComponent.appComponent)
+actual fun createNewsMainComponent(component: AppComponent): NewsMainComponent {
+    return NewsMainComponent::class.create(component.articlesRepository)
 }