diff --git a/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/di/AppModule.kt b/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/di/AppModule.kt index 6ace94977..841490e1f 100644 --- a/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/di/AppModule.kt +++ b/app/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/di/AppModule.kt @@ -22,6 +22,7 @@ import com.google.samples.apps.nowinandroid.core.data.di.dataModule import com.google.samples.apps.nowinandroid.core.database.di.databaseModule import com.google.samples.apps.nowinandroid.core.datastore.di.dataStoreModule import com.google.samples.apps.nowinandroid.core.di.commonModule +import com.google.samples.apps.nowinandroid.core.domain.di.domainModule import com.google.samples.apps.nowinandroid.core.network.di.networkModule import com.google.samples.apps.nowinandroid.core.notifications.di.notificationModule import com.google.samples.apps.nowinandroid.feature.bookmarks.di.bookmarksModule @@ -65,6 +66,7 @@ internal val appModules = module { databaseModule, dataModule, dataStoreModule(), + domainModule, networkModule, notificationModule, ) diff --git a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsUseCase.kt b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsUseCase.kt index c233132c2..46fa2f41b 100644 --- a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsUseCase.kt +++ b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetFollowableTopicsUseCase.kt @@ -28,7 +28,6 @@ import org.koin.core.annotation.Factory /** * A use case which obtains a list of topics with their followed state. */ -@Factory class GetFollowableTopicsUseCase( private val topicsRepository: TopicsRepository, private val userDataRepository: UserDataRepository, diff --git a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetRecentSearchQueriesUseCase.kt b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetRecentSearchQueriesUseCase.kt index d9561a02d..680a98637 100644 --- a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetRecentSearchQueriesUseCase.kt +++ b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetRecentSearchQueriesUseCase.kt @@ -24,7 +24,6 @@ import org.koin.core.annotation.Factory /** * A use case which returns the recent search queries. */ -@Factory class GetRecentSearchQueriesUseCase( private val recentSearchRepository: RecentSearchRepository, ) { diff --git a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetSearchContentsUseCase.kt b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetSearchContentsUseCase.kt index 4da614779..3f5f4e662 100644 --- a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetSearchContentsUseCase.kt +++ b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/GetSearchContentsUseCase.kt @@ -25,12 +25,10 @@ import com.google.samples.apps.nowinandroid.core.model.data.UserNewsResource import com.google.samples.apps.nowinandroid.core.model.data.UserSearchResult import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.combine -import org.koin.core.annotation.Factory /** * A use case which returns the searched contents matched with the search query. */ -@Factory class GetSearchContentsUseCase( private val searchContentsRepository: SearchContentsRepository, private val userDataRepository: UserDataRepository, diff --git a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/di/DomainModule.kt b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/di/DomainModule.kt index a898b2ae4..0d544a902 100644 --- a/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/di/DomainModule.kt +++ b/core/domain/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/domain/di/DomainModule.kt @@ -16,9 +16,14 @@ package com.google.samples.apps.nowinandroid.core.domain.di -import org.koin.core.annotation.ComponentScan -import org.koin.core.annotation.Module +import com.google.samples.apps.nowinandroid.core.domain.GetFollowableTopicsUseCase +import com.google.samples.apps.nowinandroid.core.domain.GetRecentSearchQueriesUseCase +import com.google.samples.apps.nowinandroid.core.domain.GetSearchContentsUseCase +import org.koin.core.module.dsl.factoryOf +import org.koin.dsl.module -@Module -@ComponentScan -class DomainModule +val domainModule = module { + factoryOf(::GetFollowableTopicsUseCase) + factoryOf(::GetRecentSearchQueriesUseCase) + factoryOf(::GetSearchContentsUseCase) +} \ No newline at end of file diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 4b56ead00..df17bffeb 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -35,6 +35,7 @@ kotlin { api(projects.core.ui) api(projects.core.designsystem) api(projects.core.data) + api(projects.core.domain) api(projects.core.model) api(projects.core.analytics) api(projects.core.notifications)