KTOR-5800 Bump Ktor to 2.3.0 (#170)

Stexxe · web-flow · commit b4c9b61197bb · 2023-04-19T20:51:01.000+04:00
* KTOR-5800 Bump Ktor to 2.3.0
* KTOR-5800 Enable IR for the chat sample
* KTOR-5800 Enable IR for the fullstack MPP sample
diff --git a/chat/build.gradle b/chat/build.gradle
@@ -3,15 +3,15 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
     }
 }
 
 apply plugin: 'kotlin-multiplatform'
 
 kotlin {
     targets {
-        js('frontend') {
+        js('frontend', IR) {
             browser {
                 testTask {
                     enabled = false
@@ -25,15 +25,15 @@ kotlin {
         jvm('backend') {
             compilations.main {
                 tasks.named(processResourcesTaskName) {
-                    dependsOn(frontendBrowserWebpack)
+                    dependsOn(frontendProcessResources)
                 }
             }
         }
     }
 
     sourceSets.each {
         it.dependencies {
-            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.2.4"))
+            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.0"))
         }
     }
 
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.2.4"))
+            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.0"))
         }
     }
 
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.2.4"
+        classpath "io.ktor.plugin:plugin:2.3.0"
     }
 }
 
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.2.4"
+        classpath "io.ktor.plugin:plugin:2.3.0"
     }
 }
 
diff --git a/di-kodein/build.gradle.kts b/di-kodein/build.gradle.kts
@@ -3,7 +3,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
     kotlin("plugin.serialization") version "1.8.0"
 }
 
diff --git a/filelisting/build.gradle.kts b/filelisting/build.gradle.kts
@@ -3,7 +3,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
 }
 
 application {
diff --git a/fullstack-mpp/build.gradle b/fullstack-mpp/build.gradle
@@ -6,20 +6,21 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
     }
 }
 
 apply plugin: 'kotlin-multiplatform'
 
 kotlin {
     targets {
-        js('frontend') {
+        js('frontend', IR) {
             browser {
                 testTask {
                     // TODO: disable browser tests since we can't run it on teamcity agents yet
                     enabled = false
                 }
+                binaries.executable()
             }
         }
         jvm('backend') {
@@ -28,7 +29,7 @@ kotlin {
 
     sourceSets.each {
         it.dependencies {
-            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.2.4"))
+            implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.0"))
         }
     }
 
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.2.4"
+    id("io.ktor.plugin") version "2.3.0"
     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.2.4"
+    id("io.ktor.plugin") version "2.3.0"
 }
 
 group = "io.ktor.samples"
diff --git a/httpbin/build.gradle.kts b/httpbin/build.gradle.kts
@@ -3,7 +3,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
 }
 
 application {
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.2.4"
+    id("io.ktor.plugin") version "2.3.0"
 }
 
 application {
diff --git a/kweet/build.gradle.kts b/kweet/build.gradle.kts
@@ -4,7 +4,7 @@ val exposed_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
     kotlin("plugin.serialization") version "1.8.0"
 }
 
diff --git a/location-header/build.gradle.kts b/location-header/build.gradle.kts
@@ -3,7 +3,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
 }
 
 application {
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.2.4</version>
+                <version>2.3.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/redirect-with-exception/build.gradle.kts b/redirect-with-exception/build.gradle.kts
@@ -3,7 +3,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
 }
 
 application {
diff --git a/reverse-proxy-ws/build.gradle.kts b/reverse-proxy-ws/build.gradle.kts
@@ -3,7 +3,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
 }
 
 application {
diff --git a/reverse-proxy/build.gradle.kts b/reverse-proxy/build.gradle.kts
@@ -3,7 +3,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
 }
 
 application {
diff --git a/rx/build.gradle.kts b/rx/build.gradle.kts
@@ -3,7 +3,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
 }
 
 application {
diff --git a/sse/build.gradle.kts b/sse/build.gradle.kts
@@ -3,7 +3,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
 }
 
 application {
diff --git a/structured-logging/build.gradle.kts b/structured-logging/build.gradle.kts
@@ -3,7 +3,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
 }
 
 application {
diff --git a/version-diff/build.gradle.kts b/version-diff/build.gradle.kts
@@ -5,7 +5,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
     kotlin("plugin.serialization") version "1.8.0"
 }
 
diff --git a/youkube/build.gradle.kts b/youkube/build.gradle.kts
@@ -3,7 +3,7 @@ val logback_version: String by project
 
 plugins {
     kotlin("jvm") version "1.8.0"
-    id("io.ktor.plugin") version "2.2.4"
+    id("io.ktor.plugin") version "2.3.0"
     kotlin("plugin.serialization") version "1.8.0"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,15 @@ buildscript {`
`3`	`3`	`mavenCentral()`
`4`	`4`	`}`
`5`	`5`	`dependencies {`
`6`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"`
	`6`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"`
`7`	`7`	`}`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`apply plugin: 'kotlin-multiplatform'`
`11`	`11`
`12`	`12`	`kotlin {`
`13`	`13`	`targets {`
`14`		`- js('frontend') {`
	`14`	`+ js('frontend', IR) {`
`15`	`15`	`browser {`
`16`	`16`	`testTask {`
`17`	`17`	`enabled = false`
`@@ -25,15 +25,15 @@ kotlin {`
`25`	`25`	`jvm('backend') {`
`26`	`26`	`compilations.main {`
`27`	`27`	`tasks.named(processResourcesTaskName) {`
`28`		`- dependsOn(frontendBrowserWebpack)`
	`28`	`+ dependsOn(frontendProcessResources)`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`sourceSets.each {`
`35`	`35`	`it.dependencies {`
`36`		`- implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.2.4"))`
	`36`	`+ implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.0"))`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ kotlin {`
`19`	`19`
`20`	`20`	`sourceSets.each {`
`21`	`21`	`it.dependencies {`
`22`		`- implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.2.4"))`
	`22`	`+ implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.0"))`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`	`7`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"`
`8`		`- classpath "io.ktor.plugin:plugin:2.2.4"`
	`8`	`+ classpath "io.ktor.plugin:plugin:2.3.0"`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ val logback_version: String by project`
`3`	`3`
`4`	`4`	`plugins {`
`5`	`5`	`kotlin("jvm") version "1.8.0"`
`6`		`- id("io.ktor.plugin") version "2.2.4"`
	`6`	`+ id("io.ktor.plugin") version "2.3.0"`
`7`	`7`	`kotlin("plugin.serialization") version "1.8.0"`
`8`	`8`	`}`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -6,20 +6,21 @@ buildscript {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"`
	`9`	`+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`apply plugin: 'kotlin-multiplatform'`
`14`	`14`
`15`	`15`	`kotlin {`
`16`	`16`	`targets {`
`17`		`- js('frontend') {`
	`17`	`+ js('frontend', IR) {`
`18`	`18`	`browser {`
`19`	`19`	`testTask {`
`20`	`20`	`// TODO: disable browser tests since we can't run it on teamcity agents yet`
`21`	`21`	`enabled = false`
`22`	`22`	`}`
	`23`	`+ binaries.executable()`
`23`	`24`	`}`
`24`	`25`	`}`
`25`	`26`	`jvm('backend') {`
`@@ -28,7 +29,7 @@ kotlin {`
`28`	`29`
`29`	`30`	`sourceSets.each {`
`30`	`31`	`it.dependencies {`
`31`		`- implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.2.4"))`
	`32`	`+ implementation(project.dependencies.enforcedPlatform("io.ktor:ktor-bom:2.3.0"))`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`application`
`3`	`3`	`kotlin("jvm") version "1.7.20"`
`4`		`- id("io.ktor.plugin") version "2.2.4"`
	`4`	`+ id("io.ktor.plugin") version "2.3.0"`
`5`	`5`	`id("org.graalvm.buildtools.native") version "0.9.11"`
`6`	`6`	`}`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ val logback_version: String by project`
`4`	`4`	`plugins {`
`5`	`5`	`application`
`6`	`6`	`kotlin("jvm") version "1.7.20"`
`7`		`- id("io.ktor.plugin") version "2.2.4"`
	`7`	`+ id("io.ktor.plugin") version "2.3.0"`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`group = "io.ktor.samples"`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`kotlin("jvm") version "1.8.10"`
`3`	`3`	`kotlin("plugin.serialization") version "1.8.10"`
`4`		`- id("io.ktor.plugin") version "2.2.4"`
	`4`	`+ id("io.ktor.plugin") version "2.3.0"`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`application {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ val exposed_version: String by project`
`4`	`4`
`5`	`5`	`plugins {`
`6`	`6`	`kotlin("jvm") version "1.8.0"`
`7`		`- id("io.ktor.plugin") version "2.2.4"`
	`7`	`+ id("io.ktor.plugin") version "2.3.0"`
`8`	`8`	`kotlin("plugin.serialization") version "1.8.0"`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ val logback_version: String by project`
`5`	`5`
`6`	`6`	`plugins {`
`7`	`7`	`kotlin("jvm") version "1.8.0"`
`8`		`- id("io.ktor.plugin") version "2.2.4"`
	`8`	`+ id("io.ktor.plugin") version "2.3.0"`
`9`	`9`	`kotlin("plugin.serialization") version "1.8.0"`
`10`	`10`	`}`
`11`	`11`