Migrate to com.ivy-apps.di

Ivy-Apps · Aug 23, 2024 · 29ad7d0 · 29ad7d0
1 parent f6491ef
commit 29ad7d0
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 278 deletions.
diff --git a/composeApp/src/commonMain/kotlin/data/di/DataModule.kt b/composeApp/src/commonMain/kotlin/data/di/DataModule.kt
@@ -5,9 +5,8 @@ import data.LessonRepository
 import data.TopicsRepository
 import ivy.di.Di
 import ivy.di.Di.register
-import ivy.di.DiModule
 
-object DataModule : DiModule {
+object DataModule : Di.Module {
     override fun init() = Di.appScope {
         register { TopicsRepository(Di.get(), Di.get()) }
         register { CourseRepository(Di.get(), Di.get()) }

diff --git a/composeApp/src/commonMain/kotlin/di/AppModule.kt b/composeApp/src/commonMain/kotlin/di/AppModule.kt
@@ -3,13 +3,12 @@ package di
 import ivy.di.Di
 import ivy.di.Di.register
 import ivy.di.Di.singleton
-import ivy.di.DiModule
 import systemNavigation
 import ui.navigation.Navigation
 import util.DispatchersProvider
 import util.DispatchersProviderImpl
 
-object AppModule : DiModule {
+object AppModule : Di.Module {
 
     override fun init() {
         Di.appScope {

diff --git a/composeApp/src/commonMain/kotlin/ui/navigation/Screen.kt b/composeApp/src/commonMain/kotlin/ui/navigation/Screen.kt
@@ -2,6 +2,7 @@ package ui.navigation
 
 import androidx.compose.runtime.Composable
 import ivy.di.Di
+import ivy.di.FeatureScope
 import kotlinx.coroutines.CompletableJob
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -14,17 +15,17 @@ abstract class Screen {
     private lateinit var job: CompletableJob
     protected lateinit var screenScope: CoroutineScope
 
-    protected abstract fun onDi(): Di.ScreenScope.() -> Unit
+    protected abstract fun onDi(): Di.Scope.() -> Unit
 
     fun initialize() {
         job = SupervisorJob()
         screenScope = CoroutineScope(Dispatchers.Main + job)
-        onDi().invoke(Di.ScreenScope)
+        onDi().invoke(FeatureScope)
     }
 
     fun destroy() {
         job.cancel()
-        Di.clearInstances(Di.ScreenScope)
+        Di.clearInstances(FeatureScope)
     }
 
 

diff --git a/composeApp/src/commonMain/kotlin/ui/screen/course/CourseScreen.kt b/composeApp/src/commonMain/kotlin/ui/screen/course/CourseScreen.kt
@@ -14,7 +14,7 @@ class CourseScreen(
 ) : Screen() {
     override val path: String = "course"
 
-    override fun onDi(): Di.ScreenScope.() -> Unit = {
+    override fun onDi(): Di.Scope.() -> Unit = {
         register { CourseViewStateMapper() }
         register {
             CourseViewModel(

diff --git a/composeApp/src/commonMain/kotlin/ui/screen/home/HomeScreen.kt b/composeApp/src/commonMain/kotlin/ui/screen/home/HomeScreen.kt
@@ -10,7 +10,7 @@ import ui.screen.home.mapper.HomeViewStateMapper
 class HomeScreen : Screen() {
     override val path: String = "home"
 
-    override fun onDi(): Di.ScreenScope.() -> Unit = {
+    override fun onDi(): Di.Scope.() -> Unit = {
         register { HomeViewStateMapper() }
         register { HomeViewModel(Di.get(), Di.get(), Di.get()) }
     }

diff --git a/composeApp/src/commonMain/kotlin/ui/screen/intro/IntroScreen.kt b/composeApp/src/commonMain/kotlin/ui/screen/intro/IntroScreen.kt
@@ -9,7 +9,7 @@ import ui.screen.intro.composable.IntroContent
 class IntroScreen : Screen() {
     override val path: String = "intro"
 
-    override fun onDi(): Di.ScreenScope.() -> Unit = {
+    override fun onDi(): Di.Scope.() -> Unit = {
         register { IntroViewModel(Di.get()) }
     }
 

diff --git a/composeApp/src/commonMain/kotlin/ui/screen/lesson/LessonScreen.kt b/composeApp/src/commonMain/kotlin/ui/screen/lesson/LessonScreen.kt
@@ -18,7 +18,7 @@ class LessonScreen(
 ) : Screen() {
     override val path: String = "lesson"
 
-    override fun onDi(): Di.ScreenScope.() -> Unit = {
+    override fun onDi(): Di.Scope.() -> Unit = {
         register { LessonTreeManager() }
         register { LessonViewStateMapper(Di.get(), Di.get()) }
         register { OnBackClickEventHandler(Di.get()) }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -23,6 +23,7 @@ kotlin-coroutines = "1.8.0"
 jebrains-exposed = "0.49.0"
 
 [libraries]
+ivyApps-di = { module = "com.ivy-apps:di", version = "0.0.3" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" }
 androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" }

diff --git a/server/src/main/kotlin/ivy/learn/data/di/DataModule.kt b/server/src/main/kotlin/ivy/learn/data/di/DataModule.kt
@@ -2,14 +2,13 @@ package ivy.learn.data.di
 
 import ivy.di.Di
 import ivy.di.Di.register
-import ivy.di.DiModule
 import ivy.learn.data.database.Database
 import ivy.learn.data.repository.CoursesRepository
 import ivy.learn.data.repository.LessonsRepository
 import ivy.learn.data.repository.TopicsRepository
 import ivy.learn.data.source.LessonContentDataSource
 
-object DataModule : DiModule {
+object DataModule : Di.Module {
     override fun init() = Di.appScope {
         register { Database() }
         register { LessonContentDataSource(Di.get(), Di.get()) }

diff --git a/server/src/main/kotlin/ivy/learn/di/AppModule.kt b/server/src/main/kotlin/ivy/learn/di/AppModule.kt
@@ -3,13 +3,12 @@ package ivy.learn.di
 import ivy.di.Di
 import ivy.di.Di.register
 import ivy.di.Di.singleton
-import ivy.di.DiModule
 import ivy.learn.Environment
 import ivy.learn.EnvironmentImpl
 import ivy.learn.LearnServer
 import ivy.learn.ServerConfigurationProvider
 
-class AppModule(private val devMode: Boolean) : DiModule {
+class AppModule(private val devMode: Boolean) : Di.Module {
     override fun init() = Di.appScope {
         register<Environment> { EnvironmentImpl() }
         register { ServerConfigurationProvider(Di.get()) }

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -24,6 +24,7 @@ kotlin {
 
         commonMain.dependencies {
             implementation(libs.bundles.arrow)
+            api(libs.ivyApps.di)
         }
     }
 }
diff --git a/shared/src/commonMain/kotlin/ivy/di/DiContainer.kt b/shared/src/commonMain/kotlin/ivy/di/DiContainer.kt
diff --git a/shared/src/commonMain/kotlin/ivy/di/SharedModule.kt b/shared/src/commonMain/kotlin/ivy/di/SharedModule.kt
@@ -23,7 +23,7 @@ import kotlinx.serialization.modules.subclass
 import platform
 import io.ktor.client.plugins.logging.LogLevel as KtorLogLevel
 
-object SharedModule : DiModule {
+object SharedModule : Di.Module {
 
     override fun init() = Di.appScope {
         singleton<Platform> { platform() }
@@ -37,7 +37,7 @@ object SharedModule : DiModule {
     }
 
     @OptIn(ExperimentalSerializationApi::class)
-    private fun Di.DiScope.json() = singleton {
+    private fun Di.Scope.json() = singleton {
         Json {
             ignoreUnknownKeys = true
             isLenient = true
@@ -59,7 +59,7 @@ object SharedModule : DiModule {
         }
     }
 
-    private fun Di.DiScope.ktorClient() = singleton {
+    private fun Di.Scope.ktorClient() = singleton {
         val platform = Di.get<Platform>()
         platform.httpClient {
             install(ContentNegotiation) {