From 121f2b322b8fd91ace30f19ac5370765d3148a1a Mon Sep 17 00:00:00 2001 From: kaaveh Date: Thu, 7 May 2026 10:23:17 +0330 Subject: [PATCH] #339 remove `Koin` android artifact --- data/market-repository/build.gradle.kts | 2 +- domain/market/build.gradle.kts | 2 +- feature/marketdetail/build.gradle.kts | 6 ++++-- .../java/ir/composenews/marketdetail/MarketDetailScreen.kt | 2 +- .../ir/composenews/marketdetail/di/MarketDetailModule.kt | 2 +- feature/marketlist/build.gradle.kts | 6 ++++-- .../main/java/ir/composenews/marketlist/MarketListScreen.kt | 2 +- .../java/ir/composenews/marketlist/di/MarketListModule.kt | 2 +- gradle/libs.versions.toml | 3 +++ 9 files changed, 17 insertions(+), 10 deletions(-) diff --git a/data/market-repository/build.gradle.kts b/data/market-repository/build.gradle.kts index eca34f3a..173d89d4 100644 --- a/data/market-repository/build.gradle.kts +++ b/data/market-repository/build.gradle.kts @@ -54,7 +54,7 @@ dependencies { implementation(libs.kermit) // Koin - implementation(libs.koin.android) + implementation(libs.koin.core) // Test androidTestImplementation(kotlin("test")) diff --git a/domain/market/build.gradle.kts b/domain/market/build.gradle.kts index 841e5675..4c3e9d1a 100644 --- a/domain/market/build.gradle.kts +++ b/domain/market/build.gradle.kts @@ -51,7 +51,7 @@ kotlin { dependencies { // Koin - implementation(libs.koin.android) + implementation(libs.koin.core) // Test androidTestImplementation(kotlin("test")) diff --git a/feature/marketdetail/build.gradle.kts b/feature/marketdetail/build.gradle.kts index b09049cd..71e434c9 100644 --- a/feature/marketdetail/build.gradle.kts +++ b/feature/marketdetail/build.gradle.kts @@ -62,8 +62,10 @@ configurations.all { dependencies { // Koin - implementation(libs.koin.android) - implementation(libs.koin.androidx.compose) + implementation(libs.koin.core) + implementation(libs.koin.compose) + implementation(libs.koin.compose.viewmodel) + implementation(libs.koin.core.viewmodel) // Compose BOM implementation(platform(libs.compose.bom)) diff --git a/feature/marketdetail/src/main/java/ir/composenews/marketdetail/MarketDetailScreen.kt b/feature/marketdetail/src/main/java/ir/composenews/marketdetail/MarketDetailScreen.kt index 73d86740..7738896a 100644 --- a/feature/marketdetail/src/main/java/ir/composenews/marketdetail/MarketDetailScreen.kt +++ b/feature/marketdetail/src/main/java/ir/composenews/marketdetail/MarketDetailScreen.kt @@ -31,7 +31,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp -import org.koin.androidx.compose.koinViewModel +import org.koin.compose.viewmodel.koinViewModel import coil.compose.rememberAsyncImagePainter import ir.composenews.base.LoadableComponent import ir.composenews.designsystem.component.LocalAnimatedVisibilityScope diff --git a/feature/marketdetail/src/main/java/ir/composenews/marketdetail/di/MarketDetailModule.kt b/feature/marketdetail/src/main/java/ir/composenews/marketdetail/di/MarketDetailModule.kt index 8f3aaaf0..4996b126 100644 --- a/feature/marketdetail/src/main/java/ir/composenews/marketdetail/di/MarketDetailModule.kt +++ b/feature/marketdetail/src/main/java/ir/composenews/marketdetail/di/MarketDetailModule.kt @@ -1,7 +1,7 @@ package ir.composenews.marketdetail.di import ir.composenews.marketdetail.MarketDetailViewModel -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module val marketDetailModule = diff --git a/feature/marketlist/build.gradle.kts b/feature/marketlist/build.gradle.kts index ff7e9e6b..17ac822f 100644 --- a/feature/marketlist/build.gradle.kts +++ b/feature/marketlist/build.gradle.kts @@ -62,8 +62,10 @@ configurations.all { dependencies { // Koin - implementation(libs.koin.android) - implementation(libs.koin.androidx.compose) + implementation(libs.koin.core) + implementation(libs.koin.compose) + implementation(libs.koin.compose.viewmodel) + implementation(libs.koin.core.viewmodel) // Compose BOM implementation(platform(libs.compose.bom)) diff --git a/feature/marketlist/src/main/java/ir/composenews/marketlist/MarketListScreen.kt b/feature/marketlist/src/main/java/ir/composenews/marketlist/MarketListScreen.kt index 5bb001ca..3bc4acda 100644 --- a/feature/marketlist/src/main/java/ir/composenews/marketlist/MarketListScreen.kt +++ b/feature/marketlist/src/main/java/ir/composenews/marketlist/MarketListScreen.kt @@ -27,7 +27,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp -import org.koin.androidx.compose.koinViewModel +import org.koin.compose.viewmodel.koinViewModel import androidx.paging.LoadState import androidx.paging.compose.collectAsLazyPagingItems import androidx.paging.compose.itemKey diff --git a/feature/marketlist/src/main/java/ir/composenews/marketlist/di/MarketListModule.kt b/feature/marketlist/src/main/java/ir/composenews/marketlist/di/MarketListModule.kt index 609c935f..455ea444 100644 --- a/feature/marketlist/src/main/java/ir/composenews/marketlist/di/MarketListModule.kt +++ b/feature/marketlist/src/main/java/ir/composenews/marketlist/di/MarketListModule.kt @@ -1,7 +1,7 @@ package ir.composenews.marketlist.di import ir.composenews.marketlist.MarketListViewModel -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.dsl.module val marketListModule = diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f45b1b6b..d2e7e52d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -90,6 +90,9 @@ kermit = { group = "co.touchlab", name = "kermit", version.ref = "kermit" } koin-core = { group = "io.insert-koin", name = "koin-core", version.ref = "koin" } koin-android = { group = "io.insert-koin", name = "koin-android", version.ref = "koin" } koin-androidx-compose = { group = "io.insert-koin", name = "koin-androidx-compose", version.ref = "koin" } +koin-compose = { group = "io.insert-koin", name = "koin-compose", version.ref = "koin" } +koin-compose-viewmodel = { group = "io.insert-koin", name = "koin-compose-viewmodel", version.ref = "koin" } +koin-core-viewmodel = { group = "io.insert-koin", name = "koin-core-viewmodel", version.ref = "koin" } koin-workmanager = { group = "io.insert-koin", name = "koin-androidx-workmanager", version.ref = "koin" } lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifeCycle" }