diff --git a/compiler/daemon/daemon-common-new/build.gradle.kts b/compiler/daemon/daemon-common-new/build.gradle.kts index bd1770f6cb8..6da287e39a4 100644 --- a/compiler/daemon/daemon-common-new/build.gradle.kts +++ b/compiler/daemon/daemon-common-new/build.gradle.kts @@ -16,6 +16,11 @@ dependencies { exclude(group = group, module = module) } } + api(commonDependency("io.ktor", "ktor-utils")) { + ktorExcludesForDaemon.forEach { (group, module) -> + exclude(group = group, module = module) + } + } } sourceSets { diff --git a/compiler/daemon/daemon-common-new/src/org/jetbrains/kotlin/daemon/common/experimental/socketInfrastructure/StreamWrappers.kt b/compiler/daemon/daemon-common-new/src/org/jetbrains/kotlin/daemon/common/experimental/socketInfrastructure/StreamWrappers.kt index cd0c7aa213f..444ca813212 100644 --- a/compiler/daemon/daemon-common-new/src/org/jetbrains/kotlin/daemon/common/experimental/socketInfrastructure/StreamWrappers.kt +++ b/compiler/daemon/daemon-common-new/src/org/jetbrains/kotlin/daemon/common/experimental/socketInfrastructure/StreamWrappers.kt @@ -6,6 +6,8 @@ package org.jetbrains.kotlin.daemon.common.experimental.socketInfrastructure import io.ktor.network.sockets.* +import io.ktor.utils.io.* +import io.ktor.utils.io.core.readBytes import kotlinx.coroutines.CompletableDeferred import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.GlobalScope @@ -13,8 +15,6 @@ import kotlinx.coroutines.ObsoleteCoroutinesApi import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.actor import kotlinx.coroutines.channels.consumeEach -import kotlinx.coroutines.io.* -import kotlinx.io.core.readBytes import java.io.* import java.nio.ByteBuffer import java.util.logging.Logger diff --git a/gradle/versions.properties b/gradle/versions.properties index c448480f76e..0b9f3bdf810 100644 --- a/gradle/versions.properties +++ b/gradle/versions.properties @@ -47,7 +47,8 @@ versions.kotlinx-coroutines-core-jvm=1.5.0 versions.kotlinx-coroutines-core=1.5.0 versions.kotlinx-metadata-jvm=0.5.0 versions.kotlinx-serialization-json=1.3.3 -versions.ktor-network=1.0.1 +versions.ktor-network=1.4.0 +versions.ktor-utils=1.4.0 versions.ktor-server-test-host=1.1.5 versions.ktor-server-core=1.6.7 versions.ktor-server-netty=1.6.7