Bump versions

Kotlin to 2.1.0 and some dependencies.

Remove opt-in annotations and custom serialization of kotlin uuid.

build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     // need to specify version here because this plugin in used in multiple subprojects
-    kotlin("jvm") version "2.0.20" apply false
-    kotlin("plugin.serialization") version "2.0.20" apply false
+    kotlin("jvm") version "2.1.0" apply false
+    kotlin("plugin.serialization") version "2.1.0" apply false
 
     // some tooling seems to prefer this format
     //    id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0" apply false

excel-read-named-v5/build.gradle.kts

@@ -13,7 +13,7 @@ repositories {
 
 dependencies {
     implementation("org.apache.poi:poi-ooxml:5.3.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime:${libs.versions.kotlinx.datetime.get()}")
     implementation(project(":zummon"))
 
     testImplementation(kotlin("test"))

fudura-client/build.gradle.kts

@@ -13,7 +13,7 @@ repositories {
 dependencies {
     testImplementation(kotlin("test"))
 
-    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime:${libs.versions.kotlinx.datetime.get()}")
 
     implementation(platform("org.http4k:http4k-bom:5.31.1.0"))
     implementation("org.http4k:http4k-core")

settings.gradle.kts

@@ -12,8 +12,9 @@ include(
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
-            version("exposed", "0.54.0")
-            version("kotlinx-serialization-json", "1.7.2")
+            version("exposed", "0.57.0")
+            version("kotlinx-serialization-json", "1.8.0")
+            version("kotlinx-datetime", "0.6.1")
         }
     }
 }

zorm/build.gradle.kts

@@ -41,6 +41,14 @@ tasks {
     }
 }
 
+kotlin {
+    sourceSets {
+        all {
+            languageSettings.optIn("kotlin.uuid.ExperimentalUuidApi")
+        }
+    }
+}
+
 publishing {
     publications {
         create<MavenPublication>("maven") {

zorm/src/main/kotlin/com/zenmo/orm/companysurvey/ProjectRepository.kt

@@ -58,12 +58,10 @@ class ProjectRepository(
         }
     }
 
-    @OptIn(ExperimentalUuidApi::class)
     fun save(project: Project): Project {
         return saveProject(project)
     }
 
-    @OptIn(ExperimentalUuidApi::class)
     fun saveToUser(project: Project, userId: UUID) {
         transaction(db) {
             val savedProject = saveProject(project)
@@ -108,7 +106,6 @@ class ProjectRepository(
                 .single()[ProjectTable.buurtCodes]
         }
 
-    @OptIn(ExperimentalUuidApi::class)
     fun hydrateProject(row: ResultRow): Project {
         return Project(
             id = row[ProjectTable.id],

zorm/src/main/kotlin/com/zenmo/orm/companysurvey/SurveyRepository.kt

@@ -261,7 +261,6 @@ class SurveyRepository(
         )
     }
 
-    @OptIn(ExperimentalUuidApi::class)
     protected fun hydrateUser(row: ResultRow): com.zenmo.zummon.User? {
         val userId = row[CompanySurveyTable.createdById] ?: return null
 

zorm/src/test/kotlin/com/zenmo/orm/companysurvey/SurveyRepositoryTest.kt

@@ -110,7 +110,6 @@ class SurveyRepositoryTest {
     }
 
     @Test
-    @OptIn(ExperimentalUuidApi::class)
     fun testCreatorIsSetOnCreateButNotOnEdit() {
         val db = connectToPostgres()
 

zorm/src/test/kotlin/com/zenmo/orm/user/UserRepositoryTest.kt

@@ -93,7 +93,6 @@ class UserRepositoryTest {
         assertEquals(userId, users.first().id)
     }
 
-    @OptIn(ExperimentalUuidApi::class)
     @Test
     fun `test getUsersAndProjects loads projects`() {
         val userId = UUID.randomUUID()

ztor/build.gradle.kts

@@ -1,10 +1,10 @@
 
-val ktor_version = "3.0.1"
+val ktor_version = "3.0.3"
 
 plugins {
     kotlin("jvm")
 
-    id("io.ktor.plugin") version "2.3.12"
+    id("io.ktor.plugin") version "3.0.3"
     kotlin("plugin.serialization")
 }
 
@@ -77,7 +77,7 @@ dependencies {
     implementation("com.nimbusds:nimbus-jose-jwt:9.39.2")
     implementation("com.google.crypto.tink:tink:1.13.0")
 
-    implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-datetime:${libs.versions.kotlinx.datetime.get()}")
     implementation("com.benasher44:uuid:0.8.4")
 
     testImplementation("io.ktor:ktor-server-test-host:$ktor_version")
@@ -90,3 +90,11 @@ tasks.withType<Test> {
         this.showStandardStreams = true
     }
 }
+
+kotlin {
+    sourceSets {
+        all {
+            languageSettings.optIn("kotlin.uuid.ExperimentalUuidApi")
+        }
+    }
+}

zummon/build.gradle.kts

@@ -36,7 +36,7 @@ kotlin {
             dependencies {
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:${libs.versions.kotlinx.serialization.json.get()}")
                 implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${libs.versions.kotlinx.serialization.json.get()}")
-                implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
+                implementation("org.jetbrains.kotlinx:kotlinx-datetime:${libs.versions.kotlinx.datetime.get()}")
                 implementation("com.benasher44:uuid:0.8.4")
             }
         }

zummon/src/commonMain/kotlin/User.kt

@@ -12,7 +12,6 @@ import kotlin.uuid.Uuid
 @Serializable
 @JsExport
 data class User(
-    @Serializable(with = KotlinUuidSerializer::class)
     val id: Uuid = Uuid.random(),
     val note: String,
     val projects: List<Project> = emptyList()