Update kotlinx-coroutines to v1.10.1 (#4568)

* Update kotlinx-coroutines monorepo to v1.10.1

* Remove workaround for CoroutinesTimeout

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Osip Fatkullin <osip.fatkullin@jetbrains.com>

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ kotlin = "2.1.0"
 kotlinx-html = "0.11.0"
 kotlinx-datetime = "0.6.1"
 kotlinx-io = "0.6.0"
-coroutines = "1.9.0"
+coroutines = "1.10.1"
 atomicfu = "0.27.0"
 serialization = "1.7.3"
 binaryCompatibilityValidator = "0.17.0"

ktor-client/ktor-client-cio/jvm/test/io/ktor/client/engine/cio/CIORequestTest.kt

@@ -17,9 +17,9 @@ import io.ktor.server.engine.*
 import io.ktor.server.netty.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import io.ktor.test.junit.coroutines.*
 import io.mockk.mockkStatic
 import io.mockk.verify
+import kotlinx.coroutines.debug.junit5.CoroutinesTimeout
 import kotlinx.coroutines.delay
 import java.net.InetAddress
 import java.nio.channels.UnresolvedAddressException

ktor-client/ktor-client-cio/jvm/test/io/ktor/client/engine/cio/ConnectErrorsTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.client.engine.cio
@@ -17,7 +17,7 @@ import io.ktor.server.engine.*
 import io.ktor.server.netty.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import io.ktor.test.junit.coroutines.*
+import kotlinx.coroutines.debug.junit5.CoroutinesTimeout
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import java.io.File

ktor-client/ktor-client-test-base/build.gradle.kts

@@ -11,10 +11,4 @@ kotlin.sourceSets {
             api(project(":ktor-shared:ktor-test-base"))
         }
     }
-
-    jvmMain {
-        dependencies {
-            implementation(libs.kotlinx.coroutines.debug)
-        }
-    }
 }

ktor-client/ktor-client-tests/jvm/src/io/ktor/client/tests/utils/TestWithKtor.kt

@@ -7,7 +7,7 @@ package io.ktor.client.tests.utils
 import ch.qos.logback.classic.Level
 import ch.qos.logback.classic.Logger
 import io.ktor.server.engine.*
-import io.ktor.test.junit.coroutines.*
+import kotlinx.coroutines.debug.junit5.CoroutinesTimeout
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.slf4j.LoggerFactory

ktor-network/jvm/test/io/ktor/network/sockets/tests/ClientSocketTest.kt

@@ -1,16 +1,16 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.network.sockets.tests
 
 import io.ktor.network.selector.*
 import io.ktor.network.sockets.*
 import io.ktor.test.junit.*
-import io.ktor.test.junit.coroutines.*
 import io.ktor.utils.io.*
 import io.mockk.*
 import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.debug.junit5.CoroutinesTimeout
 import kotlinx.coroutines.runBlocking
 import java.net.InetSocketAddress
 import java.net.ServerSocket

ktor-network/jvm/test/io/ktor/network/sockets/tests/ServerSocketTest.kt

@@ -1,14 +1,14 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.network.sockets.tests
 
 import io.ktor.network.selector.*
 import io.ktor.network.sockets.*
-import io.ktor.test.junit.coroutines.*
 import io.ktor.utils.io.*
 import kotlinx.coroutines.*
+import kotlinx.coroutines.debug.junit5.CoroutinesTimeout
 import java.io.IOException
 import java.nio.channels.CancelledKeyException
 import java.nio.channels.ClosedChannelException

ktor-network/ktor-network-tls/jvm/test/io/ktor/network/tls/ConnectionTest.kt

@@ -1,13 +1,12 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.network.tls
 
 import io.ktor.network.selector.*
 import io.ktor.network.sockets.*
 import io.ktor.network.tls.certificates.*
-import io.ktor.test.junit.coroutines.*
 import io.ktor.util.cio.*
 import io.ktor.utils.io.*
 import io.netty.bootstrap.ServerBootstrap
@@ -19,6 +18,7 @@ import io.netty.channel.socket.nio.NioServerSocketChannel
 import io.netty.handler.ssl.SslContextBuilder
 import io.netty.handler.ssl.SslHandler
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.debug.junit5.CoroutinesTimeout
 import kotlinx.coroutines.runBlocking
 import java.io.File
 import java.io.IOException

ktor-server/ktor-server-cio/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 description = ""
@@ -24,7 +24,6 @@ kotlin.sourceSets {
         dependencies {
             api(project(":ktor-server:ktor-server-core", configuration = "testOutput"))
             api(libs.logback.classic)
-            implementation(libs.kotlinx.coroutines.debug)
         }
     }
 }

ktor-server/ktor-server-plugins/ktor-server-websockets/jvm/test/io/ktor/tests/websocket/WebSocketTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.tests.websocket
@@ -12,14 +12,14 @@ import io.ktor.server.application.*
 import io.ktor.server.testing.*
 import io.ktor.server.websocket.*
 import io.ktor.server.websocket.WebSockets
-import io.ktor.test.junit.coroutines.*
 import io.ktor.util.*
 import io.ktor.util.reflect.*
 import io.ktor.utils.io.charsets.*
 import io.ktor.utils.io.core.*
 import io.ktor.websocket.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.ClosedReceiveChannelException
+import kotlinx.coroutines.debug.junit5.CoroutinesTimeout
 import kotlinx.io.readByteArray
 import kotlin.random.Random
 import kotlin.test.*

ktor-server/ktor-server-test-base/jvm/src/io/ktor/server/test/base/BaseTestJvm.kt

@@ -7,9 +7,9 @@ package io.ktor.server.test.base
 import io.ktor.test.*
 import io.ktor.test.dispatcher.*
 import io.ktor.test.junit.*
-import io.ktor.test.junit.coroutines.*
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.debug.junit5.CoroutinesTimeout
 import kotlinx.coroutines.test.TestResult
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.TestInfo

ktor-server/ktor-server-test-suites/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 description = ""
@@ -23,7 +23,6 @@ kotlin.sourceSets {
             implementation(project(":ktor-server:ktor-server-plugins:ktor-server-conditional-headers"))
             implementation(project(":ktor-server:ktor-server-plugins:ktor-server-default-headers"))
             implementation(project(":ktor-server:ktor-server-plugins:ktor-server-request-validation"))
-            implementation(libs.kotlinx.coroutines.debug)
         }
     }
 

ktor-server/ktor-server-test-suites/jvm/src/io/ktor/server/testing/suites/ClientCertTestSuite.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 package io.ktor.server.testing.suites
@@ -13,7 +13,7 @@ import io.ktor.network.tls.certificates.*
 import io.ktor.server.engine.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import io.ktor.test.junit.coroutines.*
+import kotlinx.coroutines.debug.junit5.CoroutinesTimeout
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import kotlin.test.Test

ktor-shared/ktor-test-base/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ * Copyright 2014-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
  */
 
 description = "Common extensions for testing Ktor"
@@ -16,7 +16,7 @@ kotlin.sourceSets {
         dependencies {
             api(libs.kotlin.test.junit5)
             api(libs.junit)
-            implementation(libs.kotlinx.coroutines.debug)
+            api(libs.kotlinx.coroutines.debug)
         }
     }
 }