Bump Ktor to 3.0.0 and Kotlin to 2.0.20 (#197)

* Bump Ktor to 3.0.0 and Kotlin to 2.0.20 * Migrate to Ktor 3.0.0 * Fix tests * Remove comment * Downgrade version of logback
ktorio · Oct 10, 2024 · f8f6e53 · f8f6e53
1 parent 1ac6457
commit f8f6e53
Show file tree

Hide file tree

Showing 67 changed files with 230 additions and 554 deletions.
diff --git a/chat/build.gradle b/chat/build.gradle
@@ -3,11 +3,13 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:2.0.20"
     }
 }
 
 apply plugin: 'kotlin-multiplatform'
+apply plugin: 'org.jetbrains.kotlin.plugin.serialization'
 
 kotlin {
     targets {
@@ -28,14 +30,14 @@ kotlin {
 
     sourceSets.each {
         it.dependencies {
-            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.12"))
+            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:3.0.0"))
         }
     }
 
     sourceSets {
         backendMain {
             dependencies {
-                implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21"
+                implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.20"
                 implementation "io.ktor:ktor-server-netty"
                 implementation "io.ktor:ktor-server-websockets"
                 implementation "io.ktor:ktor-server-call-logging"
@@ -70,6 +72,7 @@ repositories {
 
 tasks.named("backendProcessResources").configure {
     dependsOn("frontendBrowserProductionWebpack")
+    dependsOn("frontendBrowserDistribution")
 }
 
 tasks.register("run", JavaExec) {

diff --git a/chat/src/backendMain/kotlin/ChatApplication.kt b/chat/src/backendMain/kotlin/ChatApplication.kt
@@ -4,15 +4,17 @@ import io.ktor.server.application.*
 import io.ktor.server.engine.*
 import io.ktor.server.http.content.*
 import io.ktor.server.netty.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.CallLogging
 import io.ktor.server.plugins.defaultheaders.*
 import io.ktor.server.routing.*
 import io.ktor.server.sessions.*
 import io.ktor.server.websocket.*
 import io.ktor.util.*
 import io.ktor.websocket.*
 import kotlinx.coroutines.channels.*
-import java.time.*
+import kotlinx.serialization.Serializable
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.minutes
 
 /**
  * An entry point of the application.
@@ -61,7 +63,7 @@ class ChatApplication {
         // This installs the WebSockets plugin to be able to establish a bidirectional configuration
         // between the server and the client
         install(WebSockets) {
-            pingPeriod = Duration.ofMinutes(1)
+            pingPeriod = 1.minutes
         }
         // This enables the use of sessions to keep information between requests/refreshes of the browser.
         install(Sessions) {
@@ -121,19 +123,14 @@ class ChatApplication {
             }
 
             // This defines a block of static resources for the '/' path (since no path is specified and we start at '/')
-            static {
-                // This marks index.html from the 'web' folder in resources as the default file to serve.
-                defaultResource("index.html", "web")
-                // This serves files from the 'web' folder in the application resources.
-                resources("web")
-            }
-
+            staticResources("", "web")
         }
     }
 
     /**
      * A chat session is identified by a unique nonce ID. This nonce comes from a secure random source.
      */
+    @Serializable
     data class ChatSession(val id: String)
 
     /**

diff --git a/chat/src/backendTest/kotlin/ChatApplicationTest.kt b/chat/src/backendTest/kotlin/ChatApplicationTest.kt
@@ -1,7 +1,7 @@
 package io.ktor.samples.chat.backend
 
 import io.ktor.client.plugins.websocket.*
-import io.ktor.server.application.*
+import io.ktor.server.config.ApplicationConfig
 import io.ktor.server.testing.*
 import io.ktor.websocket.*
 import kotlin.test.*
@@ -18,6 +18,9 @@ class ChatApplicationTest {
         // First, we create a [TestApplicationEngine] that includes the module [Application.main],
         // this executes that function and thus installs all the plugins and routes to this test application.
         testApplication {
+            environment {
+                config = ApplicationConfig(null)
+            }
             // Keeps a log array that will hold all the events we want to check later at once.
             val log = arrayListOf<String>()
 
@@ -57,6 +60,9 @@ class ChatApplicationTest {
     fun testDualConversation() {
         // Creates the [TestApplicationEngine] with the [Application::main] module. Check the previous test for more details.
         testApplication {
+            environment {
+                config = ApplicationConfig(null)
+            }
             // Sets to hold the messages from each children.
             // Since this is multithreaded and socket-related.
             // The order might change in each run, so we use a Set instead of a List to check that the messages

diff --git a/chat/src/frontendMain/kotlin/main.kt b/chat/src/frontendMain/kotlin/main.kt
@@ -30,6 +30,7 @@ fun main() {
     })
 }
 
+@OptIn(DelicateCoroutinesApi::class)
 suspend fun initConnection(wsClient: WsClient) {
     try {
         wsClient.connect()

diff --git a/client-mpp/build.gradle b/client-mpp/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20")
         classpath("com.android.tools.build:gradle:7.0.4")
     }
 }

diff --git a/client-mpp/shared/build.gradle b/client-mpp/shared/build.gradle
@@ -19,7 +19,7 @@ kotlin {
 
     sourceSets.each {
         it.dependencies {
-            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.12"))
+            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:3.0.0"))
         }
     }
 

diff --git a/client-multipart/build.gradle b/client-multipart/build.gradle
@@ -4,8 +4,8 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
-        classpath "io.ktor.plugin:plugin:2.3.12"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
+        classpath "io.ktor.plugin:plugin:3.0.0"
     }
 }
 
@@ -27,7 +27,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.20'
     implementation "io.ktor:ktor-server-html-builder"
     implementation 'ch.qos.logback:logback-classic:1.4.6'
     implementation 'io.ktor:ktor-server-netty-jvm'

diff --git a/client-tools/build.gradle b/client-tools/build.gradle
@@ -4,8 +4,8 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
-        classpath "io.ktor.plugin:plugin:2.3.12"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
+        classpath "io.ktor.plugin:plugin:3.0.0"
     }
 }
 
@@ -27,7 +27,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.21'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.20'
     implementation "io.ktor:ktor-server-html-builder"
     implementation 'ch.qos.logback:logback-classic:1.4.6'
     implementation 'io.ktor:ktor-server-netty-jvm'

diff --git a/di-kodein/build.gradle.kts b/di-kodein/build.gradle.kts
@@ -2,9 +2,9 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.9.21"
-    id("io.ktor.plugin") version "2.3.12"
-    kotlin("plugin.serialization") version "1.9.21"
+    kotlin("jvm") version "2.0.20"
+    id("io.ktor.plugin") version "3.0.0"
+    kotlin("plugin.serialization") version "2.0.20"
 }
 
 application {
@@ -23,6 +23,6 @@ dependencies {
     implementation("io.ktor:ktor-server-html-builder")
     implementation("org.kodein.di:kodein-di-jvm:7.17.0")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
diff --git a/di-kodein/gradle.properties b/di-kodein/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.9.21
-logback_version=1.2.11
+kotlin_version=2.0.20
+logback_version=1.3.14
 kotlin.code.style=official
diff --git a/filelisting/build.gradle.kts b/filelisting/build.gradle.kts
@@ -2,8 +2,8 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.9.21"
-    id("io.ktor.plugin") version "2.3.12"
+    kotlin("jvm") version "2.0.20"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {
@@ -20,7 +20,7 @@ dependencies {
     implementation("io.ktor:ktor-server-default-headers")
     implementation("io.ktor:ktor-server-html-builder")
     implementation("io.ktor:ktor-server-call-logging")
-    testImplementation("io.ktor:ktor-server-tests-jvm")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
diff --git a/filelisting/gradle.properties b/filelisting/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.9.21
-logback_version=1.2.11
+kotlin_version=2.0.20
+logback_version=1.3.14
 kotlin.code.style=official
diff --git a/filelisting/src/main/kotlin/io/ktor/samples/filelisting/FileListingApplication.kt b/filelisting/src/main/kotlin/io/ktor/samples/filelisting/FileListingApplication.kt
@@ -7,7 +7,7 @@ import io.ktor.server.html.*
 import io.ktor.server.http.content.*
 import io.ktor.server.netty.*
 import io.ktor.server.plugins.*
-import io.ktor.server.plugins.callloging.*
+import io.ktor.server.plugins.calllogging.CallLogging
 import io.ktor.server.plugins.defaultheaders.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
@@ -35,7 +35,7 @@ fun main() {
                 call.respondInfo()
             }
             route("/myfiles") {
-                files(root)
+                staticFiles("", root)
                 listing(root)
             }
         }
@@ -53,7 +53,8 @@ suspend fun ApplicationCall.respondInfo() {
     respondHtml {
         body {
             style {
-                +"""
+                unsafe {
+                    """
                     table {
                         font: 1em Arial;
                         border: 1px solid black;
@@ -71,6 +72,7 @@ suspend fun ApplicationCall.respondInfo() {
                         padding: 0.5em 1em;
                     }
                 """.trimIndent()
+                }
             }
             h1 {
                 +"Ktor info"
@@ -109,32 +111,28 @@ suspend fun ApplicationCall.respondInfo() {
                 row("request.ranges()", request.ranges())
             }
 
-            for (
-                (name, value) in listOf(
-                    "request.local" to request.local,
-                    "request.origin" to request.origin
-                )
-            ) {
+            for ((name, value) in listOf(
+                "request.local" to request.local,
+                "request.origin" to request.origin
+            )) {
                 h2 {
                     +name
                 }
                 table {
                     row("$name.version", value.version)
                     row("$name.method", value.method)
                     row("$name.scheme", value.scheme)
-                    row("$name.host", value.host)
-                    row("$name.port", value.port)
+                    row("$name.host", value.localHost)
+                    row("$name.port", value.localPort)
                     row("$name.remoteHost", value.remoteHost)
                     row("$name.uri", value.uri)
                 }
             }
 
-            for (
-                (name, parameters) in listOf(
-                    "Query parameters" to request.queryParameters,
-                    "Headers" to request.headers
-                )
-            ) {
+            for ((name, parameters) in listOf(
+                "Query parameters" to request.queryParameters,
+                "Headers" to request.headers
+            )) {
                 h2 {
                     +name
                 }

diff --git a/fullstack-mpp/build.gradle b/fullstack-mpp/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
     }
 }
 
@@ -29,7 +29,7 @@ kotlin {
 
     sourceSets.each {
         it.dependencies {
-            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.12"))
+            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:3.0.0"))
         }
     }
 

diff --git a/graalvm/build.gradle.kts b/graalvm/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     application
-    kotlin("jvm") version "1.9.21"
-    id("io.ktor.plugin") version "2.3.12"
+    kotlin("jvm") version "2.0.20"
+    id("io.ktor.plugin") version "3.0.0"
     id("org.graalvm.buildtools.native") version "0.9.19"
 }
 

diff --git a/h2/build.gradle.kts b/h2/build.gradle.kts
@@ -3,8 +3,8 @@ val logback_version: String by project
 
 plugins {
     application
-    kotlin("jvm") version "1.9.21"
-    id("io.ktor.plugin") version "2.3.12"
+    kotlin("jvm") version "2.0.20"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 group = "io.ktor.samples"
@@ -29,6 +29,6 @@ dependencies {
     implementation("io.ktor:ktor-server-netty-jvm")
     implementation("ch.qos.logback:logback-classic:$logback_version")
     implementation("io.ktor:ktor-server-html-builder")
-    testImplementation("io.ktor:ktor-server-tests-jvm")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }
diff --git a/h2/gradle.properties b/h2/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.9.21
-logback_version=1.2.11
+kotlin_version=2.0.20
+logback_version=1.3.14
 kotlin.code.style=official
diff --git a/httpbin/build.gradle.kts b/httpbin/build.gradle.kts
@@ -2,8 +2,8 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.9.21"
-    id("io.ktor.plugin") version "2.3.12"
+    kotlin("jvm") version "2.0.20"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {
@@ -31,7 +31,7 @@ dependencies {
     implementation("io.ktor:ktor-server-html-builder")
     implementation("io.ktor:ktor-server-partial-content")
     implementation("ch.qos.logback:logback-classic:$logback_version")
-    testImplementation("io.ktor:ktor-server-tests-jvm")
+    testImplementation("io.ktor:ktor-server-test-host-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
 }