KTOR-6059 Bump Ktor to 2.3.2 (#175)

* KTOR-6059 Bump Ktor to 2.3.2 * KTOR-6059 Update Kotlin version * KTOR-6059 Fix YouKube test by updating cookies only when Set-Cookie header is received
ktorio · Jun 29, 2023 · f4560b8 · f4560b8
1 parent 8fdc2db
commit f4560b8
Show file tree

Hide file tree

Showing 40 changed files with 68 additions and 65 deletions.
diff --git a/chat/build.gradle b/chat/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
     }
 }
 
@@ -33,7 +33,7 @@ kotlin {
 
     sourceSets.each {
         it.dependencies {
-            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.1"))
+            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.2"))
         }
     }
 

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.1"))
+            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.2"))
         }
     }
 

diff --git a/client-multipart/build.gradle b/client-multipart/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
-        classpath "io.ktor.plugin:plugin:2.3.1"
+        classpath "io.ktor.plugin:plugin:2.3.2"
     }
 }
 

diff --git a/client-tools/build.gradle b/client-tools/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
-        classpath "io.ktor.plugin:plugin:2.3.1"
+        classpath "io.ktor.plugin:plugin:2.3.2"
     }
 }
 

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.8.0"
-    id("io.ktor.plugin") version "2.3.1"
-    kotlin("plugin.serialization") version "1.8.0"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
+    kotlin("plugin.serialization") version "1.8.22"
 }
 
 application {

diff --git a/di-kodein/gradle.properties b/di-kodein/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 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.8.0"
-    id("io.ktor.plugin") version "2.3.1"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
 }
 
 application {

diff --git a/filelisting/gradle.properties b/filelisting/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 kotlin.code.style=official
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.8.10"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22"
     }
 }
 
@@ -29,7 +29,7 @@ kotlin {
 
     sourceSets.each {
         it.dependencies {
-            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.1"))
+            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.2"))
         }
     }
 

diff --git a/graalvm/build.gradle.kts b/graalvm/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     application
     kotlin("jvm") version "1.7.20"
-    id("io.ktor.plugin") version "2.3.1"
+    id("io.ktor.plugin") version "2.3.2"
     id("org.graalvm.buildtools.native") version "0.9.11"
 }
 

diff --git a/h2/build.gradle.kts b/h2/build.gradle.kts
@@ -4,7 +4,7 @@ val logback_version: String by project
 plugins {
     application
     kotlin("jvm") version "1.7.20"
-    id("io.ktor.plugin") version "2.3.1"
+    id("io.ktor.plugin") version "2.3.2"
 }
 
 group = "io.ktor.samples"

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.8.0"
-    id("io.ktor.plugin") version "2.3.1"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
 }
 
 application {

diff --git a/httpbin/gradle.properties b/httpbin/gradle.properties
@@ -1,4 +1,4 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 kotlin.code.style=official
 

diff --git a/jwt-auth-tests/build.gradle.kts b/jwt-auth-tests/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
-    kotlin("jvm") version "1.8.10"
-    kotlin("plugin.serialization") version "1.8.10"
-    id("io.ktor.plugin") version "2.3.1"
+    kotlin("jvm") version "1.8.22"
+    kotlin("plugin.serialization") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
 }
 
 application {

diff --git a/kweet/build.gradle.kts b/kweet/build.gradle.kts
@@ -3,9 +3,9 @@ val logback_version: String by project
 val exposed_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.3.1"
-    kotlin("plugin.serialization") version "1.8.0"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
+    kotlin("plugin.serialization") version "1.8.22"
 }
 
 application {

diff --git a/kweet/gradle.properties b/kweet/gradle.properties
@@ -1,4 +1,4 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 exposed_version=0.40.1
 kotlin.code.style=official
diff --git a/location-header/build.gradle.kts b/location-header/build.gradle.kts
@@ -2,8 +2,8 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.3.1"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
 }
 
 application {

diff --git a/location-header/gradle.properties b/location-header/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 kotlin.code.style=official
diff --git a/maven-google-appengine-standard/pom.xml b/maven-google-appengine-standard/pom.xml
@@ -37,7 +37,7 @@
             <dependency>
                 <groupId>io.ktor</groupId>
                 <artifactId>ktor-bom</artifactId>
-                <version>2.3.1</version>
+                <version>2.3.2</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/mongodb/build.gradle.kts b/mongodb/build.gradle.kts
@@ -3,9 +3,9 @@ val logback_version: String by project
 val mongodb_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.8.10"
-    id("io.ktor.plugin") version "2.3.1"
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.8.10"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
+    id("org.jetbrains.kotlin.plugin.serialization") version "1.8.22"
 }
 
 group = "com.example"
@@ -32,7 +32,7 @@ dependencies {
     implementation("org.litote.kmongo:kmongo:$mongodb_version")
     testImplementation("io.ktor:ktor-server-tests-jvm")
     testImplementation("org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version")
-    testImplementation("io.ktor:ktor-server-test-host-jvm:2.3.1")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:2.3.2")
 }
 
 tasks.register("databaseInstance") {

diff --git a/mongodb/gradle.properties b/mongodb/gradle.properties
@@ -1,4 +1,4 @@
-kotlin_version=1.8.10
+kotlin_version=1.8.22
 logback_version=1.2.11
 mongodb_version=4.8.0
 kotlin.code.style=official
diff --git a/postgres/build.gradle.kts b/postgres/build.gradle.kts
@@ -2,9 +2,9 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.8.10"
+    kotlin("jvm") version "1.8.22"
     id("io.ktor.plugin") version "2.2.3"
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.8.10"
+    id("org.jetbrains.kotlin.plugin.serialization") version "1.8.22"
 }
 
 group = "com.example"

diff --git a/postgres/gradle.properties b/postgres/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.8.10
+kotlin_version=1.8.22
 logback_version=1.2.11
 kotlin.code.style=official
diff --git a/redirect-with-exception/build.gradle.kts b/redirect-with-exception/build.gradle.kts
@@ -2,8 +2,8 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.3.1"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
 }
 
 application {

diff --git a/redirect-with-exception/gradle.properties b/redirect-with-exception/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 kotlin.code.style=official
diff --git a/reverse-proxy-ws/build.gradle.kts b/reverse-proxy-ws/build.gradle.kts
@@ -2,8 +2,8 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.3.1"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
 }
 
 application {

diff --git a/reverse-proxy-ws/gradle.properties b/reverse-proxy-ws/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 kotlin.code.style=official
diff --git a/reverse-proxy/build.gradle.kts b/reverse-proxy/build.gradle.kts
@@ -2,8 +2,8 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.3.1"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
 }
 
 application {

diff --git a/reverse-proxy/gradle.properties b/reverse-proxy/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 kotlin.code.style=official
diff --git a/rx/build.gradle.kts b/rx/build.gradle.kts
@@ -2,8 +2,8 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.3.1"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
 }
 
 application {

diff --git a/rx/gradle.properties b/rx/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 kotlin.code.style=official
diff --git a/sse/build.gradle.kts b/sse/build.gradle.kts
@@ -2,8 +2,8 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.3.1"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
 }
 
 application {

diff --git a/sse/gradle.properties b/sse/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 kotlin.code.style=official
diff --git a/structured-logging/build.gradle.kts b/structured-logging/build.gradle.kts
@@ -2,8 +2,8 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.3.1"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
 }
 
 application {

diff --git a/structured-logging/gradle.properties b/structured-logging/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 kotlin.code.style=official
diff --git a/version-diff/build.gradle.kts b/version-diff/build.gradle.kts
@@ -4,9 +4,9 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.3.1"
-    kotlin("plugin.serialization") version "1.8.0"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
+    kotlin("plugin.serialization") version "1.8.22"
 }
 
 group = "org.example"

diff --git a/version-diff/gradle.properties b/version-diff/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 kotlin.code.style=official
diff --git a/youkube/build.gradle.kts b/youkube/build.gradle.kts
@@ -2,9 +2,9 @@ val kotlin_version: String by project
 val logback_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.3.1"
-    kotlin("plugin.serialization") version "1.8.0"
+    kotlin("jvm") version "1.8.22"
+    id("io.ktor.plugin") version "2.3.2"
+    kotlin("plugin.serialization") version "1.8.22"
 }
 
 application {

diff --git a/youkube/gradle.properties b/youkube/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.8.0
+kotlin_version=1.8.22
 logback_version=1.2.11
 kotlin.code.style=official
diff --git a/youkube/src/test/kotlin/YoukubeApplicationTestLegacy.kt b/youkube/src/test/kotlin/YoukubeApplicationTestLegacy.kt
@@ -127,7 +127,10 @@ private fun CookieTrackerTestApplicationEngine.handleRequest(
         addHeader("Cookie", cookieValue)
         setup()
     }.apply {
-        trackedCookies = response.headers.values("Set-Cookie").map { parseServerSetCookieHeader(it) }
+        val setCookie = response.headers.values("Set-Cookie")
+        if (setCookie.isNotEmpty()) {
+            trackedCookies = setCookie.map { parseServerSetCookieHeader(it) }
+        }
     }
 }