Update kotlin to 1.9.10 (#3761)

e5l · web-flow · commit 8a9f4a57537c · 2023-09-28T14:44:38.000+02:00
* Fix mingwX64 compilation

* Update kotlin to 1.9.10

* Fix CallLogging tests

* Fix js compilation
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -24,8 +24,8 @@ sourceSets.main {
 val ktor_version = "2.3.3"
 
 dependencies {
-    implementation(kotlin("gradle-plugin", "1.9.0"))
-    implementation(kotlin("serialization", "1.9.0"))
+    implementation(kotlin("gradle-plugin", "1.9.10"))
+    implementation(kotlin("serialization", "1.9.10"))
 
     val ktlint_version = libs.versions.ktlint.version.get()
     implementation("org.jmailen.gradle:kotlinter-gradle:$ktlint_version")
diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt
@@ -7,13 +7,13 @@ import org.gradle.kotlin.dsl.*
 fun Project.configureCommon() {
     kotlin {
         sourceSets {
-            val commonMain by getting {
+            commonMain {
                 dependencies {
                     api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutines}")
                 }
             }
 
-            val commonTest by getting {
+            commonTest {
                 dependencies {
                     implementation(kotlin("test"))
                 }
diff --git a/buildSrc/src/main/kotlin/JsConfig.kt b/buildSrc/src/main/kotlin/JsConfig.kt
@@ -27,20 +27,24 @@ private fun Project.configureJsTasks() {
     kotlin {
         js(IR) {
             nodejs {
-                testTask {
-                    useMocha {
-                        timeout = "10000"
+                testTask(
+                    Action {
+                        useMocha {
+                            timeout = "10000"
+                        }
                     }
-                }
+                )
             }
 
             browser {
-                testTask {
-                    useKarma {
-                        useChromeHeadless()
-                        useConfigDirectory(File(project.rootProject.projectDir, "karma"))
+                testTask(
+                    Action {
+                        useKarma {
+                            useChromeHeadless()
+                            useConfigDirectory(File(project.rootProject.projectDir, "karma"))
+                        }
                     }
-                }
+                )
             }
 
             binaries.library()
diff --git a/buildSrc/src/main/kotlin/KotlinExtensions.kt b/buildSrc/src/main/kotlin/KotlinExtensions.kt
@@ -27,6 +27,16 @@ fun KotlinMultiplatformExtension.createCInterop(
     }
 }
 
+fun NamedDomainObjectContainer<KotlinSourceSet>.commonMain(block: KotlinSourceSet.() -> Unit) {
+    val sourceSet = getByName("commonMain")
+    block(sourceSet)
+}
+
+fun NamedDomainObjectContainer<KotlinSourceSet>.commonTest(block: KotlinSourceSet.() -> Unit) {
+    val sourceSet = getByName("commonTest")
+    block(sourceSet)
+}
+
 fun NamedDomainObjectContainer<KotlinSourceSet>.jvmAndNixMain(block: KotlinSourceSet.() -> Unit) {
     val sourceSet = findByName("jvmAndNixMain") ?: getByName("jvmMain")
     block(sourceSet)
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -3,7 +3,7 @@
  */
 
 object Versions {
-    val kotlin = "1.9.0"
+    val kotlin = "1.9.10"
     val coroutines = "1.7.2"
     val slf4j = "1.7.36"
     val junit = "4.13.2"
diff --git a/buildSrc/src/main/kotlin/test/server/ServerUtils.kt b/buildSrc/src/main/kotlin/test/server/ServerUtils.kt
@@ -29,6 +29,7 @@ fun List<PartData>.makeString(): String = buildString {
     }
 }
 
+@Suppress("DEPRECATION")
 private fun filenameContentTypeAndContentString(provider: () -> Input, headers: Headers): String {
     val dispositionHeader: String = headers.getAll(HttpHeaders.ContentDisposition)!!.joinToString(";")
     val disposition: ContentDisposition = ContentDisposition.parse(dispositionHeader)
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/plugins/ServerSentEventsTest.kt b/ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/plugins/ServerSentEventsTest.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
 import kotlin.test.*
 
-class ServerSentEventsTest : ClientLoader() {
+class ServerSentEventsTest : ClientLoader(timeoutSeconds = 120) {
 
     @Test
     fun testExceptionIfSseIsNotInstalled() = testSuspend {
diff --git a/ktor-client/ktor-client-winhttp/windows/src/io/ktor/client/engine/winhttp/WinHttpClientEngine.kt b/ktor-client/ktor-client-winhttp/windows/src/io/ktor/client/engine/winhttp/WinHttpClientEngine.kt
@@ -13,6 +13,7 @@ import io.ktor.client.request.*
 import io.ktor.util.date.*
 import io.ktor.utils.io.*
 import kotlinx.coroutines.*
+import kotlin.coroutines.*
 
 internal class WinHttpClientEngine(
     override val config: WinHttpClientEngineConfig
@@ -30,6 +31,8 @@ internal class WinHttpClientEngine(
         }
     }
 
+    override fun toString(): String = "WinHttp"
+
     @OptIn(InternalAPI::class)
     override suspend fun execute(data: HttpRequestData): HttpResponseData {
         val callContext = callContext()
diff --git a/ktor-io/posix/src/io/ktor/utils/io/locks/Synchronized.kt b/ktor-io/posix/src/io/ktor/utils/io/locks/Synchronized.kt
@@ -8,6 +8,8 @@ import io.ktor.utils.io.*
 import io.ktor.utils.io.interop.mutex.*
 import kotlinx.cinterop.*
 import platform.posix.*
+import kotlin.concurrent.AtomicNativePtr
+import kotlin.concurrent.AtomicReference
 import kotlin.native.concurrent.*
 import kotlin.native.internal.NativePtr
 
diff --git a/ktor-server/ktor-server-plugins/ktor-server-call-logging/jvm/test/io/ktor/server/plugins/callloging/CallLoggingTest.kt b/ktor-server/ktor-server-plugins/ktor-server-call-logging/jvm/test/io/ktor/server/plugins/callloging/CallLoggingTest.kt
@@ -73,26 +73,26 @@ class CallLoggingTest {
         testApplication {
             environment { environment() }
             application {
-                hash = this.toString()
+                hash = hashCode().toString(radix = 16)
             }
         }
 
         assertTrue(messages.size >= 3, "It should be at least 3 message logged:\n$messages")
-        assertEquals(
-            "INFO: Application started: $hash",
-            messages[messages.size - 3],
-            "No started message logged:\n$messages"
-        )
-        assertEquals(
-            "INFO: Application stopping: $hash",
-            messages[messages.size - 2],
-            "No stopping message logged:\n$messages"
-        )
-        assertEquals(
-            "INFO: Application stopped: $hash",
-            messages[messages.size - 1],
-            "No stopped message logged:\n$messages"
-        )
+        assertTrue {
+            messages[messages.size - 3].startsWith(
+                "INFO: Application started: class io.ktor.server.application.Application(0x$hash)"
+            )
+        }
+        assertTrue {
+            messages[messages.size - 2].startsWith(
+                "INFO: Application stopping: class io.ktor.server.application.Application(0x$hash)"
+            )
+        }
+        assertTrue {
+            messages[messages.size - 1].startsWith(
+                "INFO: Application stopped: class io.ktor.server.application.Application(0x$hash)"
+            )
+        }
     }
 
     @Test
@@ -374,7 +374,7 @@ class CallLoggingTest {
                 }
             }
         }
-        var hash: String? = null
+        lateinit var hash: String
 
         testApplication {
             environment {
@@ -385,11 +385,11 @@ class CallLoggingTest {
                     }
                 }
             }
-            application { hash = this.toString() }
+            application { hash = hashCode().toString(radix = 16) }
         }
 
         assertTrue(customMessages.isNotEmpty())
-        assertTrue(customMessages.all { it.startsWith("CUSTOM TRACE:") && it.contains(hash!!) })
+        assertTrue(customMessages.all { it.startsWith("CUSTOM TRACE:") && it.contains(hash) })
         assertTrue(messages.isEmpty())
     }
 
diff --git a/ktor-server/ktor-server-plugins/ktor-server-jte/build.gradle.kts b/ktor-server/ktor-server-plugins/ktor-server-jte/build.gradle.kts
@@ -4,12 +4,12 @@
 
 kotlin.sourceSets {
     val jteVersion = "2.3.2"
-    val jvmMain by getting {
+    jvmMain {
         dependencies {
             api("gg.jte:jte:$jteVersion")
         }
     }
-    val jvmTest by getting {
+    jvmTest {
         dependencies {
             api(project(":ktor-server:ktor-server-plugins:ktor-server-status-pages"))
             api(project(":ktor-server:ktor-server-plugins:ktor-server-compression"))
diff --git a/ktor-utils/common/src/io/ktor/util/pipeline/Pipeline.kt b/ktor-utils/common/src/io/ktor/util/pipeline/Pipeline.kt
@@ -248,7 +248,7 @@ public open class Pipeline<TSubject : Any, TContext : Any>(
         val interceptors = interceptorsForTests()
             .joinToString("\n") { "    " + it::class.toString() }
 
-        return "${this::class.simpleName} [\n$interceptors\n]"
+        return "${this::class}(0x${hashCode().toString(16)}) [\n$interceptors\n]"
     }
 
     internal fun phaseInterceptors(phase: PipelinePhase): List<PipelineInterceptorFunction<TSubject, TContext>> =

Original file line number	Diff line number	Diff line change
`@@ -7,13 +7,13 @@ import org.gradle.kotlin.dsl.*`
`7`	`7`	`fun Project.configureCommon() {`
`8`	`8`	`kotlin {`
`9`	`9`	`sourceSets {`
`10`		`- val commonMain by getting {`
	`10`	`+ commonMain {`
`11`	`11`	`dependencies {`
`12`	`12`	`api("org.jetbrains.kotlinx:kotlinx-coroutines-core:${Versions.coroutines}")`
`13`	`13`	`}`
`14`	`14`	`}`
`15`	`15`
`16`		`- val commonTest by getting {`
	`16`	`+ commonTest {`
`17`	`17`	`dependencies {`
`18`	`18`	`implementation(kotlin("test"))`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ fun List<PartData>.makeString(): String = buildString {`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
	`32`	`+@Suppress("DEPRECATION")`
`32`	`33`	`private fun filenameContentTypeAndContentString(provider: () -> Input, headers: Headers): String {`
`33`	`34`	`val dispositionHeader: String = headers.getAll(HttpHeaders.ContentDisposition)!!.joinToString(";")`
`34`	`35`	`val disposition: ContentDisposition = ContentDisposition.parse(dispositionHeader)`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import io.ktor.client.request.*`
`13`	`13`	`import io.ktor.util.date.*`
`14`	`14`	`import io.ktor.utils.io.*`
`15`	`15`	`import kotlinx.coroutines.*`
	`16`	`+import kotlin.coroutines.*`
`16`	`17`
`17`	`18`	`internal class WinHttpClientEngine(`
`18`	`19`	`override val config: WinHttpClientEngineConfig`
`@@ -30,6 +31,8 @@ internal class WinHttpClientEngine(`
`30`	`31`	`}`
`31`	`32`	`}`
`32`	`33`
	`34`	`+ override fun toString(): String = "WinHttp"`
	`35`	`+`
`33`	`36`	`@OptIn(InternalAPI::class)`
`34`	`37`	`override suspend fun execute(data: HttpRequestData): HttpResponseData {`
`35`	`38`	`val callContext = callContext()`
Original file line number	Diff line number	Diff line change
`@@ -73,26 +73,26 @@ class CallLoggingTest {`
`73`	`73`	`testApplication {`
`74`	`74`	`environment { environment() }`
`75`	`75`	`application {`
`76`		`- hash = this.toString()`
	`76`	`+ hash = hashCode().toString(radix = 16)`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`assertTrue(messages.size >= 3, "It should be at least 3 message logged:\n$messages")`
`81`		`- assertEquals(`
`82`		`- "INFO: Application started: $hash",`
`83`		`- messages[messages.size - 3],`
`84`		`- "No started message logged:\n$messages"`
`85`		`- )`
`86`		`- assertEquals(`
`87`		`- "INFO: Application stopping: $hash",`
`88`		`- messages[messages.size - 2],`
`89`		`- "No stopping message logged:\n$messages"`
`90`		`- )`
`91`		`- assertEquals(`
`92`		`- "INFO: Application stopped: $hash",`
`93`		`- messages[messages.size - 1],`
`94`		`- "No stopped message logged:\n$messages"`
`95`		`- )`
	`81`	`+ assertTrue {`
	`82`	`+ messages[messages.size - 3].startsWith(`
	`83`	`+ "INFO: Application started: class io.ktor.server.application.Application(0x$hash)"`
	`84`	`+ )`
	`85`	`+ }`
	`86`	`+ assertTrue {`
	`87`	`+ messages[messages.size - 2].startsWith(`
	`88`	`+ "INFO: Application stopping: class io.ktor.server.application.Application(0x$hash)"`
	`89`	`+ )`
	`90`	`+ }`
	`91`	`+ assertTrue {`
	`92`	`+ messages[messages.size - 1].startsWith(`
	`93`	`+ "INFO: Application stopped: class io.ktor.server.application.Application(0x$hash)"`
	`94`	`+ )`
	`95`	`+ }`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`@Test`
`@@ -374,7 +374,7 @@ class CallLoggingTest {`
`374`	`374`	`}`
`375`	`375`	`}`
`376`	`376`	`}`
`377`		`- var hash: String? = null`
	`377`	`+ lateinit var hash: String`
`378`	`378`
`379`	`379`	`testApplication {`
`380`	`380`	`environment {`
`@@ -385,11 +385,11 @@ class CallLoggingTest {`
`385`	`385`	`}`
`386`	`386`	`}`
`387`	`387`	`}`
`388`		`- application { hash = this.toString() }`
	`388`	`+ application { hash = hashCode().toString(radix = 16) }`
`389`	`389`	`}`
`390`	`390`
`391`	`391`	`assertTrue(customMessages.isNotEmpty())`
`392`		`- assertTrue(customMessages.all { it.startsWith("CUSTOM TRACE:") && it.contains(hash!!) })`
	`392`	`+ assertTrue(customMessages.all { it.startsWith("CUSTOM TRACE:") && it.contains(hash) })`
`393`	`393`	`assertTrue(messages.isEmpty())`
`394`	`394`	`}`
`395`	`395`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@`
`4`	`4`
`5`	`5`	`kotlin.sourceSets {`
`6`	`6`	`val jteVersion = "2.3.2"`
`7`		`- val jvmMain by getting {`
	`7`	`+ jvmMain {`
`8`	`8`	`dependencies {`
`9`	`9`	`api("gg.jte:jte:$jteVersion")`
`10`	`10`	`}`
`11`	`11`	`}`
`12`		`- val jvmTest by getting {`
	`12`	`+ jvmTest {`
`13`	`13`	`dependencies {`
`14`	`14`	`api(project(":ktor-server:ktor-server-plugins:ktor-server-status-pages"))`
`15`	`15`	`api(project(":ktor-server:ktor-server-plugins:ktor-server-compression"))`
Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ public open class Pipeline<TSubject : Any, TContext : Any>(`
`248`	`248`	`val interceptors = interceptorsForTests()`
`249`	`249`	`.joinToString("\n") { " " + it::class.toString() }`
`250`	`250`
`251`		`- return "${this::class.simpleName} [\n$interceptors\n]"`
	`251`	`+ return "${this::class}(0x${hashCode().toString(16)}) [\n$interceptors\n]"`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`internal fun phaseInterceptors(phase: PipelinePhase): List<PipelineInterceptorFunction<TSubject, TContext>> =`