Bump Ktor to 3.0.0 and Kotlin to 2.0.20

ktorio · Oct 9, 2024 · d12954e · d12954e
1 parent 1ac6457
commit d12954e
Show file tree

Hide file tree

Showing 48 changed files with 86 additions and 86 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.9.21"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20"
     }
 }
 
@@ -28,14 +28,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"

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 {

diff --git a/di-kodein/gradle.properties b/di-kodein/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.9.21
+kotlin_version=2.0.20
 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.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 {

diff --git a/filelisting/gradle.properties b/filelisting/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.9.21
+kotlin_version=2.0.20
 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.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"

diff --git a/h2/gradle.properties b/h2/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.9.21
+kotlin_version=2.0.20
 logback_version=1.2.11
 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 {

diff --git a/httpbin/gradle.properties b/httpbin/gradle.properties
@@ -1,4 +1,4 @@
-kotlin_version=1.9.21
+kotlin_version=2.0.20
 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.9.21"
-    kotlin("plugin.serialization") version "1.9.21"
-    id("io.ktor.plugin") version "2.3.12"
+    kotlin("jvm") version "2.0.20"
+    kotlin("plugin.serialization") version "2.0.20"
+    id("io.ktor.plugin") version "3.0.0"
 }
 
 application {

diff --git a/ktor-client-wasm/gradle/libs.versions.toml b/ktor-client-wasm/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 compose = "1.6.2"
 compose-plugin = "1.6.0"
 junit = "4.13.2"
-kotlin = "1.9.22"
+kotlin = "2.0.20"
 ktor = "3.0.0-beta-2-eap-920"
 
 [libraries]

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.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 {

diff --git a/kweet/gradle.properties b/kweet/gradle.properties
@@ -1,4 +1,4 @@
-kotlin_version=1.9.21
+kotlin_version=2.0.20
 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.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 {

diff --git a/location-header/gradle.properties b/location-header/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.9.21
+kotlin_version=2.0.20
 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
@@ -11,7 +11,7 @@
     <artifactId>maven-google-appengine-standard</artifactId>
 
     <properties>
-        <kotlin.version>1.9.21</kotlin.version>
+        <kotlin.version>2.0.20</kotlin.version>
         <slf4j.version>1.7.36</slf4j.version>
         <appengine.version>2.0.12</appengine.version>
         <servlet.version>4.0.1</servlet.version>
@@ -37,7 +37,7 @@
             <dependency>
                 <groupId>io.ktor</groupId>
                 <artifactId>ktor-bom</artifactId>
-                <version>2.3.12</version>
+                <version>3.0.0</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.9.21"
-    id("io.ktor.plugin") version "2.3.12"
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.21"
+    kotlin("jvm") version "2.0.20"
+    id("io.ktor.plugin") version "3.0.0"
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.0.20"
 }
 
 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.12")
+    testImplementation("io.ktor:ktor-server-test-host-jvm:3.0.0")
 }
 
 tasks.register("databaseInstance") {

diff --git a/mongodb/gradle.properties b/mongodb/gradle.properties
@@ -1,4 +1,4 @@
-kotlin_version=1.9.21
+kotlin_version=2.0.20
 logback_version=1.2.11
 mongodb_version=4.8.0
 kotlin.code.style=official
diff --git a/mvc-web/build.gradle.kts b/mvc-web/build.gradle.kts
@@ -4,9 +4,9 @@ val h2_version: String by project
 val exposed_version: String by project
 
 plugins {
-    kotlin("jvm") version "1.9.20"
+    kotlin("jvm") version "2.0.20"
     id("io.ktor.plugin") version "2.3.6"
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.20"
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.0.20"
 }
 
 group = "com.example"

diff --git a/mvc-web/gradle.properties b/mvc-web/gradle.properties
@@ -1,4 +1,4 @@
-kotlin_version=1.9.20
+kotlin_version=2.0.20
 logback_version=1.4.11
 exposed_version=0.41.1
 h2_version=2.1.214

diff --git a/opentelemetry/client/build.gradle.kts b/opentelemetry/client/build.gradle.kts
@@ -4,8 +4,8 @@ val kotlin_version: String by project
 val opentelemetry_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"
     id("application")
 }
 

diff --git a/opentelemetry/gradle.properties b/opentelemetry/gradle.properties
@@ -1,5 +1,5 @@
-ktor_version=2.3.12
-kotlin_version=1.9.21
+ktor_version=3.0.0
+kotlin_version=2.0.20
 logback_version=1.4.11
 kotlin.code.style=official
 

diff --git a/opentelemetry/server/build.gradle.kts b/opentelemetry/server/build.gradle.kts
@@ -4,8 +4,8 @@ val opentelemetry_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"
     id("application")
 }
 

diff --git a/opentelemetry/shared/build.gradle.kts b/opentelemetry/shared/build.gradle.kts
@@ -2,8 +2,8 @@ val opentelemetry_version: String by project
 val opentelemetry_semconv_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"
 }
 
 dependencies {

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.9.21"
+    kotlin("jvm") version "2.0.20"
     id("io.ktor.plugin") version "2.2.3"
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.21"
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.0.20"
 }
 
 group = "com.example"

diff --git a/postgres/gradle.properties b/postgres/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.9.21
+kotlin_version=2.0.20
 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.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 {

diff --git a/redirect-with-exception/gradle.properties b/redirect-with-exception/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.9.21
+kotlin_version=2.0.20
 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.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 {

diff --git a/reverse-proxy-ws/gradle.properties b/reverse-proxy-ws/gradle.properties
@@ -1,3 +1,3 @@
-kotlin_version=1.9.21
+kotlin_version=2.0.20
 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.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 {