Skip to content

Commit 5889739

Browse files
authored
Merge pull request #321 from touchlab/ks/UpdatingVersions
Updating dependencies
2 parents 4d426ca + 2db49a5 commit 5889739

File tree

5 files changed

+14
-17
lines changed

5 files changed

+14
-17
lines changed

app/src/main/kotlin/co/touchlab/kampkit/android/MainApp.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import android.util.Log
77
import co.touchlab.kampkit.AppInfo
88
import co.touchlab.kampkit.initKoin
99
import co.touchlab.kampkit.models.BreedViewModel
10-
import org.koin.androidx.viewmodel.dsl.viewModel
10+
import org.koin.core.module.dsl.viewModel
1111
import org.koin.core.parameter.parametersOf
1212
import org.koin.dsl.module
1313

gradle/libs.versions.toml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@ targetSdk = "35"
55
compileSdk = "35"
66

77
# Dependencies
8-
kotlin = "2.0.21"
9-
android-gradle-plugin = "8.5.2"
8+
kotlin = "2.1.10"
9+
android-gradle-plugin = "8.9.0"
1010
ktlint-gradle = "12.1.1"
11-
compose = "1.7.5"
12-
android-desugaring = "2.1.3"
11+
compose = "1.7.8"
12+
android-desugaring = "2.1.5"
1313
androidx-core = "1.15.0"
1414
androidx-test-junit = "1.2.1"
15-
androidx-activity-compose = "1.9.3"
15+
androidx-activity-compose = "1.10.1"
1616
androidx-lifecycle = "2.8.7"
17-
junit = "4.13.2"
18-
coroutines = "1.9.0"
17+
coroutines = "1.10.1"
1918
kotlinx-datetime = "0.6.1"
20-
ktor = "3.0.1"
19+
ktor = "3.0.3"
2120
robolectric = "4.13"
22-
kermit = "2.0.4"
23-
skie = "0.9.3"
24-
koin = "3.5.3"
21+
kermit = "2.0.5"
22+
skie = "0.10.1"
23+
koin = "4.0.2"
2524
multiplatformSettings = "1.2.0"
2625
turbine = "1.2.0"
2726
sqlDelight = "2.0.2"
@@ -46,7 +45,7 @@ coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", ve
4645
koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" }
4746
koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" }
4847
koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
49-
48+
koin-view-model = { module = "io.insert-koin:koin-core-viewmodel", version.ref = "koin" }
5049
kotlinx-dateTime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
5150

5251
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

shared/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ kotlin {
6565

6666
commonMain.dependencies {
6767
implementation(libs.koin.core)
68+
implementation(libs.koin.view.model)
6869
implementation(libs.coroutines.core)
6970
implementation(libs.sqlDelight.coroutinesExt)
7071
implementation(libs.bundles.ktor.common)

shared/src/androidUnitTest/kotlin/co/touchlab/kampkit/KoinTest.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,14 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
77
import co.touchlab.kermit.Logger
88
import kotlin.test.AfterTest
99
import kotlin.test.Test
10-
import org.junit.experimental.categories.Category
1110
import org.junit.runner.RunWith
1211
import org.koin.core.context.stopKoin
1312
import org.koin.core.parameter.parametersOf
1413
import org.koin.dsl.module
15-
import org.koin.test.category.CheckModuleTest
1614
import org.koin.test.check.checkModules
1715
import org.robolectric.annotation.Config
1816

1917
@RunWith(AndroidJUnit4::class)
20-
@Category(CheckModuleTest::class)
2118
@Config(sdk = [32])
2219
class KoinTest {
2320

0 commit comments

Comments
 (0)