From 0cd32ee1912bc2d17266e7b9efa498f519598a51 Mon Sep 17 00:00:00 2001 From: Kevin Schildhorn Date: Wed, 12 Mar 2025 10:13:27 -0400 Subject: [PATCH 1/3] Updating dependencies --- .../co/touchlab/kampkit/android/MainApp.kt | 2 +- gradle/libs.versions.toml | 23 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- shared/build.gradle.kts | 1 + 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/src/main/kotlin/co/touchlab/kampkit/android/MainApp.kt b/app/src/main/kotlin/co/touchlab/kampkit/android/MainApp.kt index 18756262..76d337f5 100644 --- a/app/src/main/kotlin/co/touchlab/kampkit/android/MainApp.kt +++ b/app/src/main/kotlin/co/touchlab/kampkit/android/MainApp.kt @@ -7,7 +7,7 @@ import android.util.Log import co.touchlab.kampkit.AppInfo import co.touchlab.kampkit.initKoin import co.touchlab.kampkit.models.BreedViewModel -import org.koin.androidx.viewmodel.dsl.viewModel +import org.koin.core.module.dsl.viewModel import org.koin.core.parameter.parametersOf import org.koin.dsl.module diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a202906a..2be2c161 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -5,23 +5,22 @@ targetSdk = "35" compileSdk = "35" # Dependencies -kotlin = "2.0.21" -android-gradle-plugin = "8.5.2" +kotlin = "2.1.10" +android-gradle-plugin = "8.9.0" ktlint-gradle = "12.1.1" -compose = "1.7.5" -android-desugaring = "2.1.3" +compose = "1.7.8" +android-desugaring = "2.1.5" androidx-core = "1.15.0" androidx-test-junit = "1.2.1" -androidx-activity-compose = "1.9.3" +androidx-activity-compose = "1.10.1" androidx-lifecycle = "2.8.7" -junit = "4.13.2" -coroutines = "1.9.0" +coroutines = "1.10.1" kotlinx-datetime = "0.6.1" -ktor = "3.0.1" +ktor = "3.0.3" robolectric = "4.13" -kermit = "2.0.4" -skie = "0.9.3" -koin = "3.5.3" +kermit = "2.0.5" +skie = "0.10.1" +koin = "4.0.2" multiplatformSettings = "1.2.0" turbine = "1.2.0" sqlDelight = "2.0.2" @@ -46,7 +45,7 @@ coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", ve koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" } koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" } koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" } - +koin-view-model = { module = "io.insert-koin:koin-core-viewmodel", version.ref = "koin" } kotlinx-dateTime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" } ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4413138..cea7a793 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 6cea0706..772004af 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -65,6 +65,7 @@ kotlin { commonMain.dependencies { implementation(libs.koin.core) + implementation(libs.koin.view.model) implementation(libs.coroutines.core) implementation(libs.sqlDelight.coroutinesExt) implementation(libs.bundles.ktor.common) From db5aab607248e6eac4e636a5e08dc11d2b30cef2 Mon Sep 17 00:00:00 2001 From: Kevin Schildhorn Date: Wed, 12 Mar 2025 13:43:04 -0400 Subject: [PATCH 2/3] Update KoinTest.kt --- .../src/androidUnitTest/kotlin/co/touchlab/kampkit/KoinTest.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/shared/src/androidUnitTest/kotlin/co/touchlab/kampkit/KoinTest.kt b/shared/src/androidUnitTest/kotlin/co/touchlab/kampkit/KoinTest.kt index ba8c2b8b..74d1d9d4 100644 --- a/shared/src/androidUnitTest/kotlin/co/touchlab/kampkit/KoinTest.kt +++ b/shared/src/androidUnitTest/kotlin/co/touchlab/kampkit/KoinTest.kt @@ -12,12 +12,10 @@ import org.junit.runner.RunWith import org.koin.core.context.stopKoin import org.koin.core.parameter.parametersOf import org.koin.dsl.module -import org.koin.test.category.CheckModuleTest import org.koin.test.check.checkModules import org.robolectric.annotation.Config @RunWith(AndroidJUnit4::class) -@Category(CheckModuleTest::class) @Config(sdk = [32]) class KoinTest { From 2db49a51b20474e94c62a9d34739191c89abba6a Mon Sep 17 00:00:00 2001 From: Sam Hill Date: Wed, 12 Mar 2025 16:15:09 -0400 Subject: [PATCH 3/3] Remove unused import from KoinTest.kt --- .../src/androidUnitTest/kotlin/co/touchlab/kampkit/KoinTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/shared/src/androidUnitTest/kotlin/co/touchlab/kampkit/KoinTest.kt b/shared/src/androidUnitTest/kotlin/co/touchlab/kampkit/KoinTest.kt index 74d1d9d4..b7712351 100644 --- a/shared/src/androidUnitTest/kotlin/co/touchlab/kampkit/KoinTest.kt +++ b/shared/src/androidUnitTest/kotlin/co/touchlab/kampkit/KoinTest.kt @@ -7,7 +7,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 import co.touchlab.kermit.Logger import kotlin.test.AfterTest import kotlin.test.Test -import org.junit.experimental.categories.Category import org.junit.runner.RunWith import org.koin.core.context.stopKoin import org.koin.core.parameter.parametersOf