migrate to dagger

build.gradle.kts

@@ -18,8 +18,11 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0-RC")
     //implementation("io.insert-koin:koin-core:3.5.3")
 
-    ksp("me.tatarka.inject:kotlin-inject-compiler-ksp:0.6.3")
-    implementation("me.tatarka.inject:kotlin-inject-runtime:0.6.3")
+//    ksp("me.tatarka.inject:kotlin-inject-compiler-ksp:0.6.3")
+//    implementation("me.tatarka.inject:kotlin-inject-runtime:0.6.3")
+
+    ksp("com.google.dagger:dagger-compiler:2.48")
+    implementation("com.google.dagger:dagger:2.48")
 
 }
 

src/main/kotlin/dev/rivu/bookstore/BookStore.kt

@@ -1,23 +1,23 @@
 package dev.rivu.bookstore
 
-import dev.rivu.bookstore.data.di.DataComponent
-import dev.rivu.bookstore.data.di.create
-import dev.rivu.bookstore.di.AppComponent
-import dev.rivu.bookstore.di.BooksAppScope
-import dev.rivu.bookstore.di.create
+import dev.rivu.bookstore.di.DaggerAppComponent
 import dev.rivu.bookstore.presentation.BookStoreStates
 import dev.rivu.bookstore.presentation.BooksViewModel
+import javax.inject.Inject
 import kotlinx.coroutines.runBlocking
-import me.tatarka.inject.annotations.Inject
 import kotlin.system.exitProcess
 
 fun main() = runBlocking {
-    AppComponent::class.create(DataComponent::class.create()).app.runApp()
+    DaggerAppComponent
+        .create()
+        .bookStoreApp()
+        .runApp()
 }
 
-@BooksAppScope
-@Inject
-class BookStoreApp(val viewModel: BooksViewModel) {
+class BookStoreApp @Inject constructor() {
+
+    @Inject lateinit var viewModel: BooksViewModel
+
 
     suspend fun runApp() {
         viewModel.booksState.collect { latestState ->

src/main/kotlin/dev/rivu/bookstore/data/BooksLocalDS.kt

@@ -1,11 +1,6 @@
 package dev.rivu.bookstore.data
 
-import dev.rivu.bookstore.di.BooksAppScope
-import me.tatarka.inject.annotations.Inject
 
-
-@BooksAppScope
-@Inject
 class BooksLocalDS : BooksDS {
     private val books = mutableListOf<Book>()
 

src/main/kotlin/dev/rivu/bookstore/data/BooksRepo.kt

@@ -1,23 +1,16 @@
 package dev.rivu.bookstore.data
 
 import dev.rivu.bookstore.di.BooksAppScope
-import me.tatarka.inject.annotations.Inject
+import javax.inject.Inject
+import javax.inject.Named
 
 
 @BooksAppScope
-@Inject
-class BooksRepo(
-    private val dsMap: Map<String, BooksDS>
+class BooksRepo @Inject constructor(
+    @Named("localDS") private val localDS: BooksDS,
+    @Named("remoteDS") private val remoteDS: BooksDS,
 ) {
 
-    private val localDS: BooksDS
-    private val remoteDS: BooksDS
-
-    init {
-        localDS = dsMap["local"] ?: throw RuntimeException("Unable to get localDS, check dependency graph")
-        remoteDS = dsMap["remote"] ?: throw RuntimeException("Unable to get remoteDS, check dependency graph")
-    }
-
     fun addBook(book: Book): Boolean {
         return localDS.addBook(book)
     }

src/main/kotlin/dev/rivu/bookstore/data/di/DataModule.kt

@@ -0,0 +1,19 @@
+package dev.rivu.bookstore.data.di
+
+import dagger.Module
+import dagger.Provides
+import dev.rivu.bookstore.data.BooksDS
+import dev.rivu.bookstore.data.BooksLocalDS
+import dev.rivu.bookstore.data.BooksRemoteDS
+import javax.inject.Named
+
+@Module
+class DataModule {
+    @Provides
+    @Named("localDS")
+    fun getLocalDS(): BooksDS = BooksLocalDS()
+
+    @Provides
+    @Named("remoteDS")
+    fun getRemoteDS(): BooksDS = BooksRemoteDS.getInstance()
+}

src/main/kotlin/dev/rivu/bookstore/di/AppComponent.kt

@@ -1,12 +1,11 @@
 package dev.rivu.bookstore.di
 
+import dagger.Component
 import dev.rivu.bookstore.BookStoreApp
-import dev.rivu.bookstore.data.di.DataComponent
-import dev.rivu.bookstore.presentation.BooksViewModel
-import me.tatarka.inject.annotations.Component
+import dev.rivu.bookstore.data.di.DataModule
 
 @BooksAppScope
-@Component
-abstract class AppComponent(@Component val dataComponent: DataComponent) {
-    abstract val app: BookStoreApp
+@Component(modules = [DataModule::class])
+abstract class AppComponent() {
+    abstract fun bookStoreApp(): BookStoreApp
 }

src/main/kotlin/dev/rivu/bookstore/di/BooksAppScope.kt

@@ -1,6 +1,6 @@
 package dev.rivu.bookstore.di
 
-import me.tatarka.inject.annotations.Scope
+import javax.inject.Scope
 import kotlin.annotation.AnnotationTarget.CLASS
 import kotlin.annotation.AnnotationTarget.FUNCTION
 import kotlin.annotation.AnnotationTarget.PROPERTY_GETTER

src/main/kotlin/dev/rivu/bookstore/presentation/BooksViewModel.kt

@@ -3,15 +3,14 @@ package dev.rivu.bookstore.presentation
 import dev.rivu.bookstore.data.Book
 import dev.rivu.bookstore.data.BooksRepo
 import dev.rivu.bookstore.di.BooksAppScope
+import javax.inject.Inject
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
-import me.tatarka.inject.annotations.Inject
 
 @BooksAppScope
-@Inject
-class BooksViewModel(
+class BooksViewModel @Inject constructor(
     private val booksRepo: BooksRepo
 ) {
     private val _booksState: MutableStateFlow<BookStoreStates> = MutableStateFlow(BookStoreStates.Options)