KTOR-6053 Update Kotlin to 1.8.22 (#3663)

README.md

@@ -9,7 +9,7 @@
 
 [![Official JetBrains project](http://jb.gg/badges/official.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub)
 [![Maven Central](https://img.shields.io/maven-central/v/io.ktor/ktor)](https://mvnrepository.com/artifact/io.ktor)
-[![Kotlin](https://img.shields.io/badge/kotlin-1.8.10-blue.svg?logo=kotlin)](http://kotlinlang.org)
+[![Kotlin](https://img.shields.io/badge/kotlin-1.8.22-blue.svg?logo=kotlin)](http://kotlinlang.org)
 [![Slack channel](https://img.shields.io/badge/chat-slack-green.svg?logo=slack)](https://kotlinlang.slack.com/messages/ktor/)
 [![GitHub License](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0)
 [![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/ktorio/ktor)

build.gradle.kts

@@ -226,22 +226,3 @@ fun KotlinMultiplatformExtension.configureSourceSets() {
         findByName("jvmTest")?.resources?.srcDirs("jvmAndNix/test-resources")
     }
 }
-
-allprojects {
-    val jsTest = tasks.findByName("jsTest") ?: return@allprojects
-    val cleanJsTest = tasks.findByName("cleanJsTest") ?: return@allprojects
-
-    val cleanJsIrTest by tasks.creating {
-        dependsOn(cleanJsTest)
-    }
-
-    val jsIrTest by tasks.creating {
-        dependsOn(jsTest)
-    }
-}
-
-val jsLegacyTest by tasks.creating {
-}
-
-val cleanJsLegacyTest by tasks.creating {
-}

buildSrc/build.gradle.kts

@@ -24,8 +24,8 @@ sourceSets.main {
 val ktor_version = "2.3.0"
 
 dependencies {
-    implementation(kotlin("gradle-plugin", "1.8.10"))
-    implementation(kotlin("serialization", "1.8.10"))
+    implementation(kotlin("gradle-plugin", "1.8.22"))
+    implementation(kotlin("serialization", "1.8.22"))
 
     val ktlint_version = libs.versions.ktlint.version.get()
     implementation("org.jmailen.gradle:kotlinter-gradle:$ktlint_version")

buildSrc/src/main/kotlin/JsConfig.kt

@@ -43,23 +43,7 @@ private fun Project.configureJsTasks() {
                 }
             }
 
-            val main by compilations.getting
-            main.kotlinOptions.apply {
-                metaInfo = true
-                sourceMap = true
-                moduleKind = "umd"
-                this.main = "noCall"
-                sourceMapEmbedSources = "always"
-            }
-
-            val test by compilations.getting
-            test.kotlinOptions.apply {
-                metaInfo = true
-                sourceMap = true
-                moduleKind = "umd"
-                this.main = "call"
-                sourceMapEmbedSources = "always"
-            }
+            binaries.library()
         }
     }
 }

gradle.properties

@@ -24,14 +24,15 @@ kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCompatibilityMetadataVariant=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.internal.mpp.hierarchicalStructureByDefault=true
-kotlin.incremental.js=true
+kotlin.incremental.js.ir=false
+kotlin.incremental.js.klib=false
 kotlin.incremental.multiplatform=true
 kotlin.native.ignoreIncorrectDependencies=true
 kotlin.native.binary.memoryModel=experimental
 #kotlinx.atomicfu.enableJvmIrTransformation=true
 #kotlinx.atomicfu.enableJsIrTransformation=true
 
-kotlin_version=1.8.10
+kotlin_version=1.8.22
 coroutines_version=1.7.1
 atomicfu_version=0.20.0
 slf4j_version=1.7.36

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-kotlin-version = "1.8.10"
+kotlin-version = "1.8.22"
 kotlinx-html-version = "0.8.1"
 coroutines-version = "1.7.1"
 atomicfu-version = "0.18.5"