Update to Kotlin 2

alexandru · May 21, 2024 · eca9e95 · eca9e95
1 parent 303a1c8
commit eca9e95
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/Makefile b/Makefile
@@ -23,7 +23,10 @@ build-jvm: init-docker
 push-jvm:
 	DOCKER_EXTRA_ARGS="--push" $(MAKE) build-jvm
 
-run-jvm:
+build-jvm-local:
+	docker build -f ./src/main/docker/Dockerfile.jvm -t "${IMG_JVM}" -t "${LATEST_JVM}" .
+
+run-jvm: build-jvm-local
 	docker run -p 8080:8080 -ti ${LATEST_JVM}
 
 build-native: init-docker

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -70,6 +70,7 @@ dependencies {
     implementation(libs.commons.codec)
     implementation(libs.commons.text)
     implementation(libs.kaml)
+    implementation(libs.kotlin.logging)
     implementation(libs.kotlin.stdlib.jdk8)
     implementation(libs.kotlin.test.junit)
     implementation(libs.kotlinx.serialization.json)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -11,15 +11,16 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             version("arrow", "1.2.4")
-            version("buildToolsNative", "0.10.1")
-            version("clikt", "4.3.0")
-            version("commonsCodec", "1.16.1")
-            version("commonsText", "1.11.0")
-            version("kaml", "0.58.0")
-            version("kotlin", "1.9.23")
-            version("ktlint", "12.1.0")
-            version("ktor", "2.3.10")
-            version("logback", "1.5.3")
+            version("buildToolsNative", "0.10.2")
+            version("clikt", "4.4.0")
+            version("commonsCodec", "1.17.0")
+            version("commonsText", "1.12.0")
+            version("kaml", "0.59.0")
+            version("kotlin", "2.0.0")
+            version("kotlinLogging", "6.0.9")
+            version("ktlint", "12.1.1")
+            version("ktor", "2.3.11")
+            version("logback", "1.5.6")
             version("serialization", "1.6.3")
             version("suspendapp", "0.4.0")
             version("versions", "0.51.0")
@@ -77,6 +78,8 @@ dependencyResolutionManagement {
                 .versionRef("kaml")
             library("logback-classic", "ch.qos.logback", "logback-classic")
                 .versionRef("logback")
+            library("kotlin-logging", "io.github.oshai", "kotlin-logging-jvm")
+                .versionRef("kotlinLogging")
             library("clikt", "com.github.ajalt.clikt", "clikt")
                 .versionRef("clikt")