[#3144] Remove Persistence and use DI dispatchers in Coroutine based …

…Persistences (#3145) * [#3144] Remove Persistence and use DI dispatchers in Coroutine based Persistences * [#3144] Remove Persistence and use DI dispatchers in Coroutine based Persistences
Oztechan · Feb 1, 2024 · c59e1a5 · c59e1a5
1 parent 5f4251e
commit c59e1a5
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 156 deletions.
diff --git a/client/core/persistence/client-core-persistence.gradle.kts b/client/core/persistence/client-core-persistence.gradle.kts
@@ -16,6 +16,7 @@ kotlin {
 
  sourceSets {
  commonMain.dependencies {
+ implementation(project(Modules.Common.Core.infrastructure))
  libs.common.apply {
  implementation(koinCore)
  implementation(coroutines)

diff --git a/...kotlin/com/oztechan/ccc/client/core/persistence/di/ClientCorePersistenceModule.android.kt b/...kotlin/com/oztechan/ccc/client/core/persistence/di/ClientCorePersistenceModule.android.kt
@@ -4,19 +4,15 @@ import android.content.Context
 import android.content.SharedPreferences
 import com.oztechan.ccc.client.core.persistence.FlowPersistence
 import com.oztechan.ccc.client.core.persistence.FlowPersistenceImpl
-import com.oztechan.ccc.client.core.persistence.Persistence
-import com.oztechan.ccc.client.core.persistence.PersistenceImpl
 import com.oztechan.ccc.client.core.persistence.SuspendPersistence
 import com.oztechan.ccc.client.core.persistence.SuspendPersistenceImpl
+import com.oztechan.ccc.common.core.infrastructure.di.DISPATCHER_IO
 import com.russhwolf.settings.ObservableSettings
-import com.russhwolf.settings.Settings
 import com.russhwolf.settings.SharedPreferencesSettings
-import com.russhwolf.settings.coroutines.FlowSettings
-import com.russhwolf.settings.coroutines.SuspendSettings
 import com.russhwolf.settings.coroutines.toFlowSettings
 import com.russhwolf.settings.coroutines.toSuspendSettings
-import org.koin.core.module.dsl.bind
 import org.koin.core.module.dsl.singleOf
+import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 private const val KEY_APPLICATION_PREFERENCES = "application_preferences"
@@ -25,17 +21,13 @@ actual val clientCorePersistenceModule = module {
  singleOf(::provideSharedPreferences)
 
  single<ObservableSettings> { SharedPreferencesSettings(get()) }
- single<Settings> { get<ObservableSettings>() }
- @Suppress("OPT_IN_USAGE")
- single<SuspendSettings> { get<ObservableSettings>().toSuspendSettings() }
- @Suppress("OPT_IN_USAGE")
- single<FlowSettings> { get<ObservableSettings>().toFlowSettings() }
 
- singleOf(::PersistenceImpl) { bind<Persistence>() }
- @Suppress("OPT_IN_USAGE")
- singleOf(::FlowPersistenceImpl) { bind<FlowPersistence>() }
- @Suppress("OPT_IN_USAGE")
- singleOf(::SuspendPersistenceImpl) { bind<SuspendPersistence>() }
+ single<FlowPersistence> {
+ FlowPersistenceImpl(get<ObservableSettings>().toFlowSettings(get(named(DISPATCHER_IO))))
+ }
+ single<SuspendPersistence> {
+ SuspendPersistenceImpl(get<ObservableSettings>().toSuspendSettings(get(named(DISPATCHER_IO))))
+ }
 }
 
 private fun provideSharedPreferences(

diff --git a/...persistence/src/commonMain/kotlin/com/oztechan/ccc/client/core/persistence/Persistence.kt b/...persistence/src/commonMain/kotlin/com/oztechan/ccc/client/core/persistence/Persistence.kt
diff --git a/...istence/src/commonMain/kotlin/com/oztechan/ccc/client/core/persistence/PersistenceImpl.kt b/...istence/src/commonMain/kotlin/com/oztechan/ccc/client/core/persistence/PersistenceImpl.kt
diff --git a/...istence/src/commonTest/kotlin/com/oztechan/ccc/client/core/persistence/PersistenceTest.kt b/...istence/src/commonTest/kotlin/com/oztechan/ccc/client/core/persistence/PersistenceTest.kt
diff --git a/...ain/kotlin/com/oztechan/ccc/client/core/persistence/di/ClientCorePersistenceModule.ios.kt b/...ain/kotlin/com/oztechan/ccc/client/core/persistence/di/ClientCorePersistenceModule.ios.kt
@@ -2,34 +2,27 @@ package com.oztechan.ccc.client.core.persistence.di
 
 import com.oztechan.ccc.client.core.persistence.FlowPersistence
 import com.oztechan.ccc.client.core.persistence.FlowPersistenceImpl
-import com.oztechan.ccc.client.core.persistence.Persistence
-import com.oztechan.ccc.client.core.persistence.PersistenceImpl
 import com.oztechan.ccc.client.core.persistence.SuspendPersistence
 import com.oztechan.ccc.client.core.persistence.SuspendPersistenceImpl
+import com.oztechan.ccc.common.core.infrastructure.di.DISPATCHER_IO
 import com.russhwolf.settings.NSUserDefaultsSettings
 import com.russhwolf.settings.ObservableSettings
-import com.russhwolf.settings.Settings
-import com.russhwolf.settings.coroutines.FlowSettings
-import com.russhwolf.settings.coroutines.SuspendSettings
 import com.russhwolf.settings.coroutines.toFlowSettings
 import com.russhwolf.settings.coroutines.toSuspendSettings
-import org.koin.core.module.dsl.bind
-import org.koin.core.module.dsl.singleOf
+import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 actual val clientCorePersistenceModule = module {
  single<ObservableSettings> {
  NSUserDefaultsSettings(get<NativeDependencyWrapper>().userDefaults)
  }
- single<Settings> { get<ObservableSettings>() }
- @Suppress("OPT_IN_USAGE")
- single<SuspendSettings> { get<ObservableSettings>().toSuspendSettings() }
- @Suppress("OPT_IN_USAGE")
- single<FlowSettings> { get<ObservableSettings>().toFlowSettings() }
 
- singleOf(::PersistenceImpl) { bind<Persistence>() }
  @Suppress("OPT_IN_USAGE")
- singleOf(::FlowPersistenceImpl) { bind<FlowPersistence>() }
+ single<FlowPersistence> {
+ FlowPersistenceImpl(get<ObservableSettings>().toFlowSettings(get(named(DISPATCHER_IO))))
+ }
  @Suppress("OPT_IN_USAGE")
- singleOf(::SuspendPersistenceImpl) { bind<SuspendPersistence>() }
+ single<SuspendPersistence> {
+ SuspendPersistenceImpl(get<ObservableSettings>().toSuspendSettings(get(named(DISPATCHER_IO))))
+ }
 }