Bump versions (#337)

* Increase ktlint version

* Update other dependencies

* Fix imports lint

Author: samhill303

gradle/libs.versions.toml

@@ -7,15 +7,15 @@ compileSdk = "36"
 # Dependencies
 kotlin = "2.2.10"
 android-gradle-plugin = "8.11.2"
-ktlint-gradle = "12.2.0"
-compose = "1.7.8"
+ktlint-gradle = "13.1.0"
+compose = "1.9.1"
 android-desugaring = "2.1.5"
-androidx-core = "1.15.0"
-androidx-test-junit = "1.2.1"
-androidx-activity-compose = "1.10.1"
-androidx-lifecycle = "2.8.7"
-coroutines = "1.10.1"
-kotlinx-datetime = "0.6.2"
+androidx-core = "1.17.0"
+androidx-test-junit = "1.3.0"
+androidx-activity-compose = "1.11.0"
+androidx-lifecycle = "2.9.4"
+coroutines = "1.10.2"
+kotlinx-datetime = "0.7.1"
 ktor = "3.3.0"
 robolectric = "4.16"
 kermit = "2.0.8"

shared/src/commonMain/kotlin/co/touchlab/kampkit/Koin.kt

@@ -6,8 +6,8 @@ import co.touchlab.kampkit.models.BreedRepository
 import co.touchlab.kermit.Logger
 import co.touchlab.kermit.StaticConfig
 import co.touchlab.kermit.platformLogWriter
+import kotlin.time.Clock
 import kotlinx.coroutines.Dispatchers
-import kotlinx.datetime.Clock
 import org.koin.core.KoinApplication
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject

shared/src/commonTest/kotlin/co/touchlab/kampkit/BreedRepositoryTest.kt

@@ -12,10 +12,10 @@ import kotlin.test.AfterTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails
+import kotlin.time.Clock.System
 import kotlin.time.Duration.Companion.hours
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Clock
 
 class BreedRepositoryTest {
 
@@ -30,7 +30,7 @@ class BreedRepositoryTest {
     private val ktorApi = DogApiMock()
 
     // Need to start at non-zero time because the default value for db timestamp is 0
-    private val clock = ClockMock(Clock.System.now())
+    private val clock = ClockMock(System.now())
 
     private val repository: BreedRepository =
         BreedRepository(dbHelper, settings, ktorApi, kermit, clock)

shared/src/commonTest/kotlin/co/touchlab/kampkit/BreedViewModelTest.kt

@@ -16,6 +16,7 @@ import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Clock.System
 import kotlin.time.Duration.Companion.hours
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
@@ -24,7 +25,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.resetMain
 import kotlinx.coroutines.test.runTest
 import kotlinx.coroutines.test.setMain
-import kotlinx.datetime.Clock
 
 class BreedViewModelTest {
     private var kermit = Logger(StaticConfig())
@@ -38,7 +38,7 @@ class BreedViewModelTest {
     private val ktorApi = DogApiMock()
 
     // Need to start at non-zero time because the default value for db timestamp is 0
-    private val clock = ClockMock(Clock.System.now())
+    private val clock = ClockMock(System.now())
 
     private val repository: BreedRepository =
         BreedRepository(dbHelper, settings, ktorApi, kermit, clock)

shared/src/commonTest/kotlin/co/touchlab/kampkit/mock/ClockMock.kt

@@ -1,7 +1,7 @@
 package co.touchlab.kampkit.mock
 
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
+import kotlin.time.Clock
+import kotlin.time.Instant
 
 class ClockMock(var currentInstant: Instant) : Clock {
     override fun now(): Instant = currentInstant