Merge pull request #28 from matejsemancik/feature/update-dependencies

matejsemancik · web-flow · commit 8c6ca16deee7 · 2026-03-18T20:54:50.000+01:00
Upgrade Kotlin to latest 2.3.20, CMP and other dependencies
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -8,4 +8,5 @@ plugins {
     alias(libs.plugins.ktorfit) apply false
     alias(libs.plugins.kotlinx.serialization) apply false
     alias(libs.plugins.androidx.room) apply false
-}
+    alias(libs.plugins.composeHotReload) apply false
+}
diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
@@ -1,5 +1,4 @@
 import org.jetbrains.compose.desktop.application.dsl.TargetFormat
-import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 
 plugins {
     alias(libs.plugins.kotlinMultiplatform)
@@ -8,11 +7,6 @@ plugins {
     alias(libs.plugins.composeHotReload)
 }
 
-// https://github.com/JetBrains/compose-hot-reload?tab=readme-ov-file#enable-optimizenonskippinggroups
-composeCompiler {
-    featureFlags.add(ComposeFeatureFlag.OptimizeNonSkippingGroups)
-}
-
 kotlin {
     jvm("desktop")
 
diff --git a/desktopApp/src/desktopMain/kotlin/dev/matsem/bpm/main.kt b/desktopApp/src/desktopMain/kotlin/dev/matsem/bpm/main.kt
@@ -30,7 +30,6 @@ import dev.matsem.bpm.injection.AppInjection
 import dev.matsem.bpm.tooling.Platform
 import dev.matsem.bpm.tooling.isMetaOrCtrlPressed
 import org.jetbrains.compose.resources.painterResource
-import org.koin.compose.KoinContext
 import org.koin.compose.koinInject
 import java.awt.Desktop
 import java.awt.Taskbar
@@ -39,9 +38,7 @@ import java.awt.desktop.AppReopenedListener
 fun main() {
     AppInjection.initializeInjection()
     application {
-        KoinContext {
-            MainApplication()
-        }
+        MainApplication()
     }
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,17 +1,17 @@
 [versions]
 androidx-lifecycle = "2.8.4"
-compose-multiplatform = "1.8.0"
-compose-hotReload = "1.0.0-alpha09"
+compose-multiplatform = "1.10.2"
+compose-hotReload = "1.1.0-beta01"
 junit = "4.13.2"
-kotlin = "2.1.20"
-ksp = "2.1.20-1.0.31"
-kotlinx-coroutines = "1.10.1"
+kotlin = "2.3.20"
+ksp = "2.3.6"
+kotlinx-coroutines = "1.10.2"
 kotlinx-collections = "0.3.8"
-kotlinx-datetime = "0.6.1"
+kotlinx-datetime = "0.7.1"
 kotlinx-serialization = "2.1.0"
-ktorfit = "2.5.0"
-koin = "4.1.0-Beta5"
-ktor = "3.1.3"
+ktorfit = "2.7.2"
+koin = "4.2.0"
+ktor = "3.4.1"
 coil = "3.0.4"
 dataStore = "1.1.2"
 androidx-room = "2.7.2"
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -35,7 +35,7 @@ dependencyResolutionManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"
+    id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
 }
 
 include(":desktopApp")
diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -76,3 +76,7 @@ dependencies {
 room {
     schemaDirectory(project.layout.projectDirectory.dir("room-schemas"))
 }
+
+ktorfit {
+    compilerPluginVersion.set("2.3.3")
+}
diff --git a/shared/src/commonMain/kotlin/dev/matsem/bpm/data/database/model/Timer.kt b/shared/src/commonMain/kotlin/dev/matsem/bpm/data/database/model/Timer.kt
@@ -7,7 +7,7 @@ import androidx.room.ForeignKey
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import androidx.room.Relation
-import kotlinx.datetime.Instant
+import kotlin.time.Instant
 
 @Entity(
     tableName = "timer",
@@ -51,4 +51,4 @@ data class TimerComplete(
         entityColumn = "id"
     )
     val issue: JiraIssue,
-)
+)
diff --git a/shared/src/commonMain/kotlin/dev/matsem/bpm/data/database/typeConverter/JsonTypeConverters.kt b/shared/src/commonMain/kotlin/dev/matsem/bpm/data/database/typeConverter/JsonTypeConverters.kt
@@ -1,9 +1,12 @@
 package dev.matsem.bpm.data.database.typeConverter
 
 import androidx.room.TypeConverter
-import kotlinx.datetime.Instant
+import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.Json
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
+@OptIn(ExperimentalTime::class)
 internal class JsonTypeConverters {
 
     // When implemented using @ProvidedTypeConverter according to documentation, the runtime error is thrown,
@@ -25,4 +28,4 @@ internal class JsonTypeConverters {
     @TypeConverter
     fun jsonToInstant(string: String): Instant =
         json.decodeFromString(Instant.serializer(), string)
-}
+}
diff --git a/shared/src/commonMain/kotlin/dev/matsem/bpm/data/repo/TimerRepo.kt b/shared/src/commonMain/kotlin/dev/matsem/bpm/data/repo/TimerRepo.kt
@@ -8,7 +8,7 @@ import dev.matsem.bpm.data.repo.model.Issue
 import dev.matsem.bpm.data.repo.model.Timer
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
-import kotlinx.datetime.Clock
+import kotlin.time.Clock
 import dev.matsem.bpm.data.database.model.Timer as Timer_Database
 
 interface TimerRepo {
diff --git a/shared/src/commonMain/kotlin/dev/matsem/bpm/data/repo/WorklogRepo.kt b/shared/src/commonMain/kotlin/dev/matsem/bpm/data/repo/WorklogRepo.kt
@@ -16,16 +16,16 @@ import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.plus
-import kotlinx.datetime.Clock
 import kotlinx.datetime.DateTimeUnit
-import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.minus
 import kotlinx.datetime.plus
 import kotlinx.datetime.toLocalDateTime
+import kotlin.time.Clock
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
+import kotlin.time.Instant
 
 /**
  * Interface for managing worklogs and retrieving related work statistics.
diff --git a/shared/src/commonMain/kotlin/dev/matsem/bpm/data/repo/model/Timer.kt b/shared/src/commonMain/kotlin/dev/matsem/bpm/data/repo/model/Timer.kt
@@ -1,9 +1,9 @@
 package dev.matsem.bpm.data.repo.model
 
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
+import kotlin.time.Clock
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
+import kotlin.time.Instant
 
 data class Timer(
     val id: Int,
@@ -38,4 +38,4 @@ data class TimerState(
         }
 }
 
-val MockTimers = MockIssues.map { Timer(id = 0, issue = it, createdAt = Clock.System.now()) }
+val MockTimers = MockIssues.map { Timer(id = 0, issue = it, createdAt = Clock.System.now()) }
diff --git a/shared/src/commonMain/kotlin/dev/matsem/bpm/data/repo/model/WorkStats.kt b/shared/src/commonMain/kotlin/dev/matsem/bpm/data/repo/model/WorkStats.kt
@@ -2,7 +2,6 @@ package dev.matsem.bpm.data.repo.model
 
 import kotlinx.datetime.LocalDate
 import kotlin.time.Duration
-import kotlin.time.Duration.Companion.seconds
 
 /**
  * Represents statistics for work tracking within a specified time range.
diff --git a/shared/src/commonMain/kotlin/dev/matsem/bpm/data/service/tempo/model/Worklog.kt b/shared/src/commonMain/kotlin/dev/matsem/bpm/data/service/tempo/model/Worklog.kt
@@ -1,9 +1,9 @@
 package dev.matsem.bpm.data.service.tempo.model
 
-import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import kotlin.time.Instant
 
 @Serializable
 data class Worklog(
@@ -50,4 +50,4 @@ data class Worklog(
         @SerialName("self")
         val self: String,
     )
-}
+}
diff --git a/shared/src/commonMain/kotlin/dev/matsem/bpm/injection/module/SystemModule.kt b/shared/src/commonMain/kotlin/dev/matsem/bpm/injection/module/SystemModule.kt
@@ -1,8 +1,8 @@
 package dev.matsem.bpm.injection.module
 
-import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import org.koin.dsl.module
+import kotlin.time.Clock
 
 fun systemModule() = module {
     single<Clock> { Clock.System }
diff --git a/shared/src/commonTest/kotlin/dev/matsem/bpm/data/repo/MockWorklogRepo.kt b/shared/src/commonTest/kotlin/dev/matsem/bpm/data/repo/MockWorklogRepo.kt
@@ -11,12 +11,12 @@ import dev.matsem.bpm.data.service.tempo.model.Worklog
 import dev.matsem.bpm.utils.readResourceFile
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDate
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.atStartOfDayIn
 import kotlinx.serialization.json.Json
+import kotlin.time.Clock
+import kotlin.time.Instant
 
 /**
  * Creates a mock implementation of [WorklogRepo] for testing purposes.
diff --git a/shared/src/commonTest/kotlin/dev/matsem/bpm/data/repo/WorklogRepoTest.kt b/shared/src/commonTest/kotlin/dev/matsem/bpm/data/repo/WorklogRepoTest.kt
@@ -4,11 +4,11 @@ import dev.matsem.bpm.data.repo.model.WorkStats
 import dev.matsem.bpm.data.service.tempo.model.Worklog
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
-import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDate
 import kotlin.test.Test
 import kotlin.test.assertContains
 import kotlin.test.assertEquals
+import kotlin.time.Clock
 import kotlin.time.Duration.Companion.hours
 
 class WorklogRepoTest {
diff --git a/shared/src/commonTest/kotlin/dev/matsem/bpm/utils/ResourceReader.kt b/shared/src/commonTest/kotlin/dev/matsem/bpm/utils/ResourceReader.kt
@@ -1,7 +1,5 @@
 package dev.matsem.bpm.utils
 
-import java.nio.charset.StandardCharsets
-
 /**
  * Reads a resource file from the `commonTest/resources` directory.
  *

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ dependencyResolutionManagement {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`plugins {`
`38`		`- id("org.gradle.toolchains.foojay-resolver-convention") version "0.10.0"`
	`38`	`+ id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`include(":desktopApp")`
Original file line number	Diff line number	Diff line change
`@@ -76,3 +76,7 @@ dependencies {`
`76`	`76`	`room {`
`77`	`77`	`schemaDirectory(project.layout.projectDirectory.dir("room-schemas"))`
`78`	`78`	`}`
	`79`	`+`
	`80`	`+ktorfit {`
	`81`	`+ compilerPluginVersion.set("2.3.3")`
	`82`	`+}`