Hilt to Koin

androidApp/build.gradle.kts

@@ -10,7 +10,6 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.androidx.navigation.safeargs)
     alias(libs.plugins.palantir.git)
-    id("movies-android-hilt")
 }
 
 val gitCommitsCount by lazy {
@@ -188,6 +187,7 @@ dependencies {
     implementation(project(":feature:search-kmp"))
     implementation(project(":feature:settings-kmp"))
     implementation(libs.kotlin.reflect)
+    implementation(libs.bundles.koin.android)
     testImplementation(libs.junit)
     androidTestImplementation(libs.bundles.androidx.test.espresso)
     androidTestImplementation(libs.androidx.test.ext.junit.ktx)

androidApp/src/main/kotlin/org/michaelbel/movies/App.kt

@@ -1,30 +1,39 @@
 package org.michaelbel.movies
 
 import android.app.Application
-import androidx.hilt.work.HiltWorkerFactory
 import androidx.work.Configuration
-import dagger.hilt.android.HiltAndroidApp
-import javax.inject.Inject
-import org.michaelbel.movies.common_kmp.BuildConfig
+import org.koin.android.ext.android.inject
+import org.koin.android.ext.koin.androidContext
+import org.koin.android.ext.koin.androidLogger
+import org.koin.androidx.workmanager.factory.KoinWorkerFactory
+import org.koin.androidx.workmanager.koin.workManagerFactory
+import org.koin.core.context.startKoin
 import org.michaelbel.movies.common.crashlytics.CrashlyticsTree
+import org.michaelbel.movies.common_kmp.BuildConfig
+import org.michaelbel.movies.di.appKoinModule
 import org.michaelbel.movies.platform.app.AppService
 import org.michaelbel.movies.platform.crashlytics.CrashlyticsService
 import org.michaelbel.movies.ui.appicon.installLauncherIcon
 import timber.log.Timber
 
-@HiltAndroidApp
 internal class App: Application(), Configuration.Provider {
 
-    @Inject lateinit var workerFactory: HiltWorkerFactory
-    @Inject lateinit var appService: AppService
-    @Inject lateinit var crashlyticsService: CrashlyticsService
+    private val workerFactory: KoinWorkerFactory by inject()
+    private val appService: AppService by inject()
+    private val crashlyticsService: CrashlyticsService by inject()
 
     override val workManagerConfiguration: Configuration
         get() = Configuration.Builder().setWorkerFactory(workerFactory).build()
 
     override fun onCreate() {
         super.onCreate()
         installLauncherIcon()
+        startKoin {
+            androidLogger()
+            androidContext(this@App)
+            workManagerFactory()
+            modules(appKoinModule)
+        }
         appService.installApp()
         Timber.plant(if (BuildConfig.DEBUG) Timber.DebugTree() else CrashlyticsTree(crashlyticsService))
     }

androidApp/src/main/kotlin/org/michaelbel/movies/MainActivity.kt

@@ -4,18 +4,16 @@ import android.os.Bundle
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.activity.viewModels
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.fragment.app.FragmentActivity
-import dagger.hilt.android.AndroidEntryPoint
+import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.michaelbel.movies.common.ktx.launchAndCollectIn
 import org.michaelbel.movies.ui.ktx.resolveNotificationPreferencesIntent
 import org.michaelbel.movies.ui.shortcuts.installShortcuts
 
-@AndroidEntryPoint
 internal class MainActivity: FragmentActivity() {
 
-    private val viewModel: MainViewModel by viewModels()
+    private val viewModel: MainViewModel by viewModel()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         installSplashScreen().apply { setKeepOnScreenCondition { viewModel.splashLoading.value } }

androidApp/src/main/kotlin/org/michaelbel/movies/MainActivityContent.kt

@@ -2,10 +2,10 @@ package org.michaelbel.movies
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
+import org.koin.androidx.compose.koinViewModel
 import org.michaelbel.movies.account.accountGraph
 import org.michaelbel.movies.account.navigateToAccount
 import org.michaelbel.movies.auth.authGraph
@@ -25,7 +25,7 @@ import org.michaelbel.movies.ui.theme.MoviesTheme
 
 @Composable
 internal fun MainActivityContent(
-    viewModel: MainViewModel = hiltViewModel(),
+    viewModel: MainViewModel = koinViewModel(),
     enableEdgeToEdge: (Any, Any) -> Unit
 ) {
     val currentTheme by viewModel.currentTheme.collectAsStateWithLifecycle()

androidApp/src/main/kotlin/org/michaelbel/movies/MainViewModel.kt

@@ -6,7 +6,6 @@ import androidx.navigation.NavDestination
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.WorkManager
 import androidx.work.workDataOf
-import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -27,10 +26,8 @@ import org.michaelbel.movies.interactor.Interactor
 import org.michaelbel.movies.platform.messaging.MessagingService
 import org.michaelbel.movies.work.AccountUpdateWorker
 import org.michaelbel.movies.work.MoviesDatabaseWorker
-import javax.inject.Inject
 
-@HiltViewModel
-internal class MainViewModel @Inject constructor(
+internal class MainViewModel(
     private val interactor: Interactor,
     private val biometricController: BiometricController,
     private val analytics: MoviesAnalytics,

androidApp/src/main/kotlin/org/michaelbel/movies/di/AppKoinModule.kt

@@ -0,0 +1,29 @@
+package org.michaelbel.movies.di
+
+import org.koin.dsl.module
+import org.michaelbel.movies.account.di.accountKoinModule
+import org.michaelbel.movies.auth.di.authKoinModule
+import org.michaelbel.movies.debug.di.debugKoinModule
+import org.michaelbel.movies.details.di.detailsKoinModule
+import org.michaelbel.movies.feed.di.feedKoinModule
+import org.michaelbel.movies.gallery.di.galleryKoinModule
+import org.michaelbel.movies.platform.inject.flavorServiceKtorModule
+import org.michaelbel.movies.search.di.searchKoinModule
+import org.michaelbel.movies.settings.di.settingsKoinModule
+import org.michaelbel.movies.widget.di.glanceKoinModule
+
+val appKoinModule = module {
+    includes(
+        flavorServiceKtorModule,
+        mainKoinModule,
+        accountKoinModule,
+        authKoinModule,
+        detailsKoinModule,
+        feedKoinModule,
+        galleryKoinModule,
+        searchKoinModule,
+        settingsKoinModule,
+        debugKoinModule,
+        glanceKoinModule
+    )
+}

androidApp/src/main/kotlin/org/michaelbel/movies/di/MainKoinModule.kt

@@ -0,0 +1,23 @@
+package org.michaelbel.movies.di
+
+import org.koin.androidx.viewmodel.dsl.viewModelOf
+import org.koin.dsl.module
+import org.michaelbel.movies.MainViewModel
+import org.michaelbel.movies.analytics.di.moviesAnalyticsKoinModule
+import org.michaelbel.movies.common.biometric.di.biometricKoinModule
+import org.michaelbel.movies.debug.di.debugNotificationClientKoinModule
+import org.michaelbel.movies.interactor.di.interactorKoinModule
+import org.michaelbel.movies.platform.inject.flavorServiceKtorModule
+import org.michaelbel.movies.work.di.workKoinModule
+
+val mainKoinModule = module {
+    includes(
+        interactorKoinModule,
+        biometricKoinModule,
+        moviesAnalyticsKoinModule,
+        flavorServiceKtorModule,
+        workKoinModule,
+        debugNotificationClientKoinModule
+    )
+    viewModelOf(::MainViewModel)
+}

build.gradle.kts

@@ -14,7 +14,6 @@ plugins {
     alias(libs.plugins.google.services) apply false
     alias(libs.plugins.google.firebase.appdistribution) apply false
     alias(libs.plugins.google.firebase.crashlytics) apply false
-    alias(libs.plugins.google.hilt) apply false
     alias(libs.plugins.sqldelight) apply false
     alias(libs.plugins.androidx.navigation.safeargs) apply false
     alias(libs.plugins.spotless)

buildSrc/build.gradle.kts

@@ -6,13 +6,4 @@ dependencies {
     compileOnly(libs.gradle.plugin)
     compileOnly(libs.kotlin.plugin)
     implementation(libs.javapoet)
-}
-
-gradlePlugin {
-    plugins {
-        register("androidHilt") {
-            id = "movies-android-hilt"
-            implementationClass = "plugins.AndroidHiltConventionPlugin"
-        }
-    }
 }

buildSrc/settings.gradle.kts

@@ -21,6 +21,4 @@ dependencyResolutionManagement {
             from(files("../gradle/libs.versions.toml"))
         }
     }
-}
-
-rootProject.name = "build-logic"
+}

core/analytics-kmp/build.gradle.kts

@@ -1,7 +1,6 @@
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.android.library)
-    id("movies-android-hilt")
 }
 
 kotlin {
@@ -12,10 +11,15 @@ kotlin {
             }
         }
     }
+    jvm("desktop")
 
     sourceSets {
-        androidMain.dependencies {
+        commonMain.dependencies {
             implementation(project(":core:platform-services:interactor-kmp"))
+            implementation(libs.bundles.koin.common)
+        }
+        androidMain.dependencies {
+            implementation(libs.koin.android)
         }
     }
 }

core/analytics-kmp/src/androidMain/kotlin/org/michaelbel/movies/analytics/di/MoviesAnalyticsKoinModule.kt

@@ -0,0 +1,11 @@
+package org.michaelbel.movies.analytics.di
+
+import org.koin.core.module.dsl.bind
+import org.koin.core.module.dsl.singleOf
+import org.koin.dsl.module
+import org.michaelbel.movies.analytics.MoviesAnalytics
+import org.michaelbel.movies.analytics.impl.MoviesAnalyticsImpl
+
+val moviesAnalyticsKoinModule = module {
+    singleOf(::MoviesAnalyticsImpl) { bind<MoviesAnalytics>() }
+}