Merge branch 'main' into sessionize-video-url

Author: zsmb13

backend/build.gradle.kts

@@ -37,6 +37,10 @@ dependencies {
     implementation(libs.ktor.server.config.yaml)
     implementation(libs.ktor.server.swagger)
 
+    implementation(libs.kotlinx.datetime)
+    implementation(libs.kotlinx.serialization.core)
+    implementation(libs.kotlinx.serialization.json)
+
     implementation(libs.exposed.core)
     implementation(libs.exposed.dao)
     implementation(libs.exposed.jdbc)
@@ -55,4 +59,4 @@ dependencies {
 
 tasks.test {
     useJUnitPlatform()
-}
+}

backend/src/main/kotlin/org/jetbrains/kotlinconf/backend/model/SessionizeData.kt

@@ -1,10 +1,13 @@
+@file:OptIn(ExperimentalTime::class)
+
 package org.jetbrains.kotlinconf.backend.model
 
-import kotlinx.datetime.Instant
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import org.jetbrains.kotlinconf.SessionId
 import org.jetbrains.kotlinconf.SpeakerId
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
 @Serializable
 class SessionizeData(

backend/src/main/kotlin/org/jetbrains/kotlinconf/backend/routes/UserRoutes.kt

@@ -1,16 +1,18 @@
+@file:OptIn(ExperimentalTime::class)
+
 package org.jetbrains.kotlinconf.backend.routes
 
 import io.ktor.http.HttpStatusCode
 import io.ktor.server.request.receive
 import io.ktor.server.response.respond
 import io.ktor.server.routing.Route
 import io.ktor.server.routing.post
-import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.kotlinconf.backend.repositories.KotlinConfRepository
 import org.koin.ktor.ext.inject
-import kotlin.getValue
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 /*
 POST http://localhost:8080/sign

backend/src/main/kotlin/org/jetbrains/kotlinconf/backend/routes/VotingRoutes.kt

@@ -1,10 +1,11 @@
+@file:OptIn(ExperimentalTime::class)
+
 package org.jetbrains.kotlinconf.backend.routes
 
 import io.ktor.http.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
@@ -19,6 +20,8 @@ import org.jetbrains.kotlinconf.backend.utils.ConferenceConfig
 import org.jetbrains.kotlinconf.backend.utils.NotFound
 import org.jetbrains.kotlinconf.backend.utils.Unauthorized
 import org.koin.ktor.ext.inject
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
 
 private val COME_BACK_LATER = HttpStatusCode(477, "Come Back Later")
 

backend/src/main/kotlin/org/jetbrains/kotlinconf/backend/services/SessionizeService.kt

@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalTime::class)
+
 package org.jetbrains.kotlinconf.backend.services
 
 import io.ktor.client.HttpClient
@@ -21,6 +23,7 @@ import org.jetbrains.kotlinconf.backend.model.SessionizeData
 import org.jetbrains.kotlinconf.backend.utils.ConferenceConfig
 import org.slf4j.LoggerFactory
 import java.util.concurrent.TimeUnit
+import kotlin.time.ExperimentalTime
 
 class SessionizeService(
     private val client: HttpClient,

gradle/libs.versions.toml

@@ -28,9 +28,10 @@ jib = "3.4.4"
 junit = "4.13.2"
 kmpnotifier = "1.5.1"
 koin = "4.1.0"
-kotlin = "2.1.21"
-kotlinx-datetime = "0.6.2"
-ktor = "3.2.0"
+kotlin = "2.2.0"
+kotlinx-datetime = "0.7.0"
+kotlinxSerializationCore = "1.9.0"
+ktor = "3.2.1"
 logbackClassic = "1.5.18"
 markdown = "0.35.0"
 multiplatform-settings = "1.3.0"
@@ -70,6 +71,8 @@ koin-slf4j = { module = "io.insert-koin:koin-logger-slf4j", version.ref = "koin"
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
+kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinxSerializationCore" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationCore" }
 ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }

kotlin-js-store/yarn.lock

@@ -2518,11 +2518,6 @@ type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
-typescript@5.5.4:
-  version "5.5.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
-  integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
-
 ua-parser-js@^0.7.30:
   version "0.7.37"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.37.tgz#e464e66dac2d33a7a1251d7d7a99d6157ec27832"

shared/src/androidMain/kotlin/org/jetbrains/kotlinconf/AndroidLocalNotificationService.kt

@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalTime::class)
+
 package org.jetbrains.kotlinconf
 
 import android.Manifest
@@ -18,6 +20,7 @@ import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.toInstant
 import org.jetbrains.kotlinconf.utils.Logger
 import org.koin.mp.KoinPlatform
+import kotlin.time.ExperimentalTime
 
 const val EXTRA_LOCAL_NOTIFICATION_ID = "localNotificationId"
 private const val EXTRA_TITLE = "title"

shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/APIClient.kt

@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalTime::class)
+
 package org.jetbrains.kotlinconf
 
 import io.ktor.client.HttpClient
@@ -23,8 +25,9 @@ import io.ktor.http.takeFrom
 import io.ktor.serialization.kotlinx.json.json
 import io.ktor.utils.io.core.Closeable
 import kotlinx.coroutines.CancellationException
-import kotlinx.datetime.Instant
 import org.jetbrains.kotlinconf.utils.Logger
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 import io.ktor.client.plugins.logging.Logger as KtorLogger
 
 /**

shared/src/commonMain/kotlin/org/jetbrains/kotlinconf/TimeProvider.kt

@@ -1,3 +1,5 @@
+@file:OptIn(ExperimentalTime::class)
+
 package org.jetbrains.kotlinconf
 
 import kotlinx.coroutines.awaitCancellation
@@ -6,15 +8,16 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
-import kotlinx.datetime.Clock
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toInstant
 import kotlinx.datetime.toLocalDateTime
 import org.jetbrains.kotlinconf.utils.Logger
+import kotlin.time.Clock
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
+import kotlin.time.ExperimentalTime
 
 interface TimeProvider {
     fun now(): LocalDateTime