Migrate to built-in IO

build.gradle

@@ -110,7 +110,7 @@ allprojects {
             check(version, atomicfu_version, "atomicfu")
             check(version, coroutines_version, "coroutines")
             check(version, serialization_version, "serialization")
-            check(version, kotlinx_io_version, "kotlinx-io")
+//            check(version, kotlinx_io_version, "kotlinx-io")
         }
         kotlin_version = rootProject.properties['kotlin_snapshot_version']
         repositories {

gradle/common.gradle

@@ -3,7 +3,7 @@ kotlin.sourceSets {
         api 'org.jetbrains.kotlin:kotlin-stdlib-common'
         api group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib-common', version: kotlin_version
         api group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core-common', version: coroutines_version
-        api group: 'org.jetbrains.kotlinx', name: 'kotlinx-io', version: kotlinx_io_version
+//        api group: 'org.jetbrains.kotlinx', name: 'kotlinx-io', version: kotlinx_io_version
         api group: 'org.jetbrains.kotlinx', name: 'atomicfu', version: atomicfu_version
 
         api group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-io', version: kotlinx_io_version

gradle/darwin.gradle

@@ -17,7 +17,7 @@ kotlin {
     sourceSets {
         darwinMain.dependencies {
             implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core-native', version: coroutines_version
-            implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-io-native', version: kotlinx_io_version
+//            implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-io-native', version: kotlinx_io_version
             implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-io-native', version: kotlinx_io_version
 
             implementation "org.jetbrains.kotlinx:atomicfu:$atomicfu_version"

gradle/js.gradle

@@ -44,7 +44,7 @@ kotlin {
             api "org.jetbrains.kotlin:kotlin-stdlib-js:$kotlin_version"
 
             api group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core-js', version: coroutines_version
-            api group: 'org.jetbrains.kotlinx', name: 'kotlinx-io-js', version: kotlinx_io_version
+//            api group: 'org.jetbrains.kotlinx', name: 'kotlinx-io-js', version: kotlinx_io_version
             api group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-io-js', version: kotlinx_io_version
             api group: 'org.jetbrains.kotlinx', name: 'atomicfu-js', version: atomicfu_version
 

gradle/jvm.gradle

@@ -85,9 +85,9 @@ dependencies {
         exclude(module: 'kotlin-stdlib-jvm')
     }
 
-    jvmMainApi(group: 'org.jetbrains.kotlinx', name: 'kotlinx-io-jvm', version: kotlinx_io_version) {
-        exclude(module: 'kotlin-stdlib-jvm')
-    }
+//    jvmMainApi(group: 'org.jetbrains.kotlinx', name: 'kotlinx-io-jvm', version: kotlinx_io_version) {
+//        exclude(module: 'kotlin-stdlib-jvm')
+//    }
 
     jvmMainApi(group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-io-jvm', version: kotlinx_io_version) {
         exclude(module: 'kotlin-stdlib-jvm')

gradle/posix.gradle

@@ -81,7 +81,7 @@ kotlin {
     sourceSets {
         posixMain.dependencies {
             implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core-native', version: coroutines_version
-            implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-io-native', version: kotlinx_io_version
+//            implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-io-native', version: kotlinx_io_version
             implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-io-native', version: kotlinx_io_version
 
             implementation "org.jetbrains.kotlinx:atomicfu:$atomicfu_version"

ktor-client/ktor-client-android/jvm/src/io/ktor/client/engine/android/AndroidClientEngine.kt

@@ -12,8 +12,8 @@ import io.ktor.http.content.*
 import io.ktor.util.cio.*
 import io.ktor.util.date.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.coroutines.io.jvm.javaio.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.jvm.javaio.*
 import java.io.*
 import java.net.*
 import javax.net.ssl.*

ktor-client/ktor-client-apache/jvm/src/io/ktor/client/engine/apache/ApacheRequestProducer.kt

@@ -13,7 +13,7 @@ import io.ktor.http.content.*
 import kotlinx.atomicfu.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import org.apache.http.*
 import org.apache.http.HttpHeaders
 import org.apache.http.HttpRequest

ktor-client/ktor-client-apache/jvm/src/io/ktor/client/engine/apache/ApacheResponseConsumer.kt

@@ -6,7 +6,7 @@ package io.ktor.client.engine.apache
 
 import kotlinx.atomicfu.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import org.apache.http.*
 import org.apache.http.nio.*
 import org.apache.http.nio.protocol.*

ktor-client/ktor-client-cio/jvm/src/io/ktor/client/engine/cio/ConnectionPipeline.kt

@@ -15,10 +15,10 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.channels.*
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.io.*
-import kotlinx.coroutines.sync.*
-import kotlinx.io.core.*
-import kotlinx.io.pool.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.sync.*
+import io.ktor.utils.io.core.*
+import io.ktor.utils.io.pool.*
 import java.nio.channels.*
 import kotlin.coroutines.*
 

ktor-client/ktor-client-cio/jvm/src/io/ktor/client/engine/cio/utils.kt

@@ -14,8 +14,8 @@ import io.ktor.http.cio.websocket.*
 import io.ktor.http.content.*
 import io.ktor.util.date.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.errors.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.errors.*
 import kotlin.coroutines.*
 
 internal suspend fun HttpRequestData.write(

ktor-client/ktor-client-core/common/src/io/ktor/client/HttpClient.kt

@@ -12,7 +12,7 @@ import io.ktor.client.response.*
 import io.ktor.util.*
 import kotlinx.atomicfu.*
 import kotlinx.coroutines.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import kotlin.coroutines.*
 
 /**

ktor-client/ktor-client-core/common/src/io/ktor/client/call/HttpClientCall.kt

@@ -10,8 +10,8 @@ import io.ktor.client.response.*
 import io.ktor.util.*
 import kotlinx.atomicfu.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.core.*
 import kotlin.coroutines.*
 import kotlin.reflect.*
 

ktor-client/ktor-client-core/common/src/io/ktor/client/call/SavedCall.kt

@@ -11,8 +11,8 @@ import io.ktor.http.*
 import io.ktor.util.*
 import io.ktor.util.date.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.core.*
 import kotlin.coroutines.*
 
 

ktor-client/ktor-client-core/common/src/io/ktor/client/call/utils.kt

@@ -11,7 +11,7 @@ import io.ktor.http.*
 import io.ktor.http.content.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.CancellationException
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 
 
 @Suppress("KDocMissingDocumentation")

ktor-client/ktor-client-core/common/src/io/ktor/client/engine/HttpClientEngine.kt

@@ -10,7 +10,7 @@ import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.util.*
 import kotlinx.coroutines.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 
 /**
  * Base interface use to define engines for [HttpClient].

ktor-client/ktor-client-core/common/src/io/ktor/client/features/DefaultResponseValidation.kt

@@ -8,7 +8,7 @@ import io.ktor.client.*
 import io.ktor.client.call.*
 import io.ktor.client.response.*
 import io.ktor.util.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import kotlin.jvm.*
 
 private val ValidateMark = AttributeKey<Unit>("ValidateMark")

ktor-client/ktor-client-core/common/src/io/ktor/client/features/DefaultTransform.kt

@@ -9,8 +9,8 @@ import io.ktor.client.request.*
 import io.ktor.client.response.*
 import io.ktor.http.*
 import io.ktor.http.content.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.core.*
 
 /**
  * Install default transformers.

ktor-client/ktor-client-core/common/src/io/ktor/client/features/HttpPlainText.kt

@@ -11,9 +11,9 @@ import io.ktor.client.response.*
 import io.ktor.http.*
 import io.ktor.http.content.*
 import io.ktor.util.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.charsets.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.charsets.*
+import io.ktor.utils.io.core.*
 import kotlin.math.*
 
 /**

ktor-client/ktor-client-core/common/src/io/ktor/client/features/cache/HttpCache.kt

@@ -14,7 +14,7 @@ import io.ktor.http.*
 import io.ktor.http.content.*
 import io.ktor.util.*
 import io.ktor.util.pipeline.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 
 internal object CacheControl {
     internal val NO_STORE = HeaderValue("no-store")

ktor-client/ktor-client-core/common/src/io/ktor/client/features/cache/HttpCacheEntry.kt

@@ -9,8 +9,8 @@ import io.ktor.client.response.*
 import io.ktor.http.*
 import io.ktor.util.*
 import io.ktor.util.date.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.core.*
 
 internal suspend fun HttpCacheEntry(response: HttpResponse): HttpCacheEntry = response.use {
     val body = it.content.readRemaining().readBytes()

ktor-client/ktor-client-core/common/src/io/ktor/client/features/cookies/CookiesStorage.kt

@@ -5,7 +5,7 @@
 package io.ktor.client.features.cookies
 
 import io.ktor.http.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 
 /**
  * Storage for [Cookie].

ktor-client/ktor-client-core/common/src/io/ktor/client/features/cookies/HttpCookies.kt

@@ -10,7 +10,7 @@ import io.ktor.client.request.*
 import io.ktor.client.response.*
 import io.ktor.http.*
 import io.ktor.util.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 
 /**
  * [HttpClient] feature that handles sent `Cookie`, and received `Set-Cookie` headers,

ktor-client/ktor-client-core/common/src/io/ktor/client/features/observer/DelegatedCall.kt

@@ -12,7 +12,7 @@ import io.ktor.http.*
 import io.ktor.util.*
 import io.ktor.util.date.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import kotlin.coroutines.*
 
 /**

ktor-client/ktor-client-core/common/src/io/ktor/client/request/Content.kt

@@ -7,7 +7,7 @@ package io.ktor.client.request
 import io.ktor.http.content.*
 import io.ktor.http.*
 import io.ktor.util.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 
 @Suppress("KDocMissingDocumentation")
 @InternalAPI

ktor-client/ktor-client-core/common/src/io/ktor/client/request/forms/FormDataContent.kt

@@ -6,9 +6,9 @@ package io.ktor.client.request.forms
 
 import io.ktor.http.*
 import io.ktor.http.content.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.charsets.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.charsets.*
+import io.ktor.utils.io.core.*
 import kotlin.random.*
 
 private val RN_BYTES = "\r\n".toByteArray()

ktor-client/ktor-client-core/common/src/io/ktor/client/request/forms/formDsl.kt

@@ -7,7 +7,7 @@ package io.ktor.client.request.forms
 import io.ktor.http.*
 import io.ktor.http.content.*
 import io.ktor.util.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import kotlin.contracts.*
 
 /**

ktor-client/ktor-client-core/common/src/io/ktor/client/response/DefaultHttpResponse.kt

@@ -9,7 +9,7 @@ import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.util.*
 import io.ktor.util.date.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import kotlin.coroutines.*
 
 /**

ktor-client/ktor-client-core/common/src/io/ktor/client/response/HttpResponse.kt

@@ -11,9 +11,9 @@ import io.ktor.http.*
 import io.ktor.util.date.*
 import kotlinx.atomicfu.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.charsets.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.charsets.*
+import io.ktor.utils.io.core.*
 
 /**
  * A response for [HttpClient], second part of [HttpClientCall].

ktor-client/ktor-client-core/common/src/io/ktor/client/response/HttpResponseConfig.kt

@@ -4,7 +4,7 @@
 
 package io.ktor.client.response
 
-import kotlinx.io.charsets.*
+import io.ktor.utils.io.charsets.*
 
 open class HttpResponseConfig {
     /**

ktor-client/ktor-client-core/common/src/io/ktor/client/response/readers.kt

@@ -4,8 +4,8 @@
 
 package io.ktor.client.response
 
-import kotlinx.coroutines.io.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.core.*
 
 /**
  * Exactly reads [count] bytes of the [HttpResponse.content].

ktor-client/ktor-client-core/common/src/io/ktor/client/utils/Content.kt

@@ -7,7 +7,7 @@ package io.ktor.client.utils
 import io.ktor.http.*
 import io.ktor.http.content.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import kotlin.coroutines.*
 
 /**

ktor-client/ktor-client-core/js/src/io/ktor/client/engine/js/JsUtils.kt

@@ -8,8 +8,8 @@ import io.ktor.client.engine.*
 import io.ktor.client.request.*
 import io.ktor.http.content.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.core.*
 import org.khronos.webgl.*
 import org.w3c.fetch.*
 import kotlin.coroutines.*

ktor-client/ktor-client-core/js/src/io/ktor/client/engine/js/compatible/Utils.kt

@@ -8,7 +8,7 @@ import io.ktor.client.engine.js.*
 import io.ktor.util.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import org.khronos.webgl.*
 import org.w3c.fetch.*
 import kotlin.browser.*

ktor-client/ktor-client-core/js/src/io/ktor/client/features/websocket/JsWebSocketSession.kt

@@ -8,7 +8,7 @@ import io.ktor.http.cio.websocket.*
 import io.ktor.util.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import org.khronos.webgl.*
 import org.w3c.dom.*
 import kotlin.coroutines.*

ktor-client/ktor-client-core/jvm/src/io/ktor/client/features/DefaultTransformersJvm.kt

@@ -7,8 +7,8 @@ package io.ktor.client.features
 import io.ktor.client.*
 import io.ktor.client.response.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.coroutines.io.jvm.javaio.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.jvm.javaio.*
 import java.io.*
 
 internal actual fun HttpClient.platformDefaultTransformers() {

ktor-client/ktor-client-core/jvm/src/io/ktor/client/utils/CIOJvm.kt

@@ -6,7 +6,7 @@ package io.ktor.client.utils
 
 import io.ktor.util.*
 import kotlinx.coroutines.*
-import kotlinx.io.pool.*
+import io.ktor.utils.io.pool.*
 import java.nio.*
 
 /**

ktor-client/ktor-client-curl/posix/src/io/ktor/client/engine/curl/CurlClientEngine.kt

@@ -12,7 +12,7 @@ import io.ktor.http.*
 import io.ktor.http.cio.*
 import io.ktor.util.date.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import kotlin.coroutines.*
 
 internal class CurlClientEngine(override val config: CurlClientEngineConfig) : HttpClientEngine {

ktor-client/ktor-client-curl/posix/src/io/ktor/client/engine/curl/internal/CurlCallbacks.kt

@@ -5,7 +5,7 @@
 package io.ktor.client.engine.curl.internal
 
 import kotlinx.cinterop.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import platform.posix.*
 
 internal fun onHeadersReceived(

ktor-client/ktor-client-curl/posix/src/io/ktor/client/engine/curl/internal/CurlMultiApiHandler.kt

@@ -6,7 +6,7 @@ package io.ktor.client.engine.curl.internal
 
 import io.ktor.client.engine.curl.*
 import kotlinx.cinterop.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import libcurl.*
 
 private class RequestHolders(

ktor-client/ktor-client-curl/posix/src/io/ktor/client/engine/curl/internal/CurlRaw.kt

@@ -11,8 +11,8 @@ import io.ktor.http.*
 import io.ktor.http.content.*
 import kotlinx.cinterop.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.core.*
 import libcurl.*
 import kotlin.coroutines.*
 

ktor-client/ktor-client-features/ktor-client-auth/common/src/io/ktor/client/features/auth/providers/BasicAuthProvider.kt

@@ -9,8 +9,8 @@ import io.ktor.client.request.*
 import io.ktor.http.*
 import io.ktor.http.auth.*
 import io.ktor.util.*
-import kotlinx.io.charsets.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.charsets.*
+import io.ktor.utils.io.core.*
 
 /**
  * Add [BasicAuthProvider] to client [Auth] providers.

ktor-client/ktor-client-features/ktor-client-auth/common/src/io/ktor/client/features/auth/providers/DigestAuthProvider.kt

@@ -10,8 +10,8 @@ import io.ktor.http.*
 import io.ktor.http.auth.*
 import io.ktor.util.*
 import kotlinx.atomicfu.*
-import kotlinx.io.charsets.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.charsets.*
+import io.ktor.utils.io.core.*
 
 /**
  * Install client [DigestAuthProvider].

ktor-client/ktor-client-features/ktor-client-encoding/common/src/ContentEncoding.kt

@@ -11,7 +11,7 @@ import io.ktor.client.response.*
 import io.ktor.http.*
 import io.ktor.util.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 
 /**
  * Content-Encoding header support.

ktor-client/ktor-client-features/ktor-client-json/common/src/io/ktor/client/features/json/JsonFeature.kt

@@ -11,7 +11,7 @@ import io.ktor.client.response.*
 import io.ktor.client.utils.*
 import io.ktor.http.*
 import io.ktor.util.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 
 
 /**

ktor-client/ktor-client-features/ktor-client-json/common/src/io/ktor/client/features/json/JsonSerializer.kt

@@ -7,7 +7,7 @@ package io.ktor.client.features.json
 import io.ktor.client.call.*
 import io.ktor.http.*
 import io.ktor.http.content.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 
 /**
  * Client json serializer.

ktor-client/ktor-client-features/ktor-client-json/ktor-client-gson/jvm/src/io/ktor/client/features/json/GsonSerializer.kt

@@ -8,7 +8,7 @@ import com.google.gson.*
 import io.ktor.client.call.*
 import io.ktor.http.content.*
 import io.ktor.http.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 
 /**
  * [JsonSerializer] using [Gson] as backend.

ktor-client/ktor-client-features/ktor-client-json/ktor-client-jackson/jvm/src/io/ktor/client/features/json/JacksonSerializer.kt

@@ -9,7 +9,7 @@ import com.fasterxml.jackson.module.kotlin.*
 import io.ktor.client.call.*
 import io.ktor.http.*
 import io.ktor.http.content.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 
 class JacksonSerializer(block: ObjectMapper.() -> Unit = {}) : JsonSerializer {
 

ktor-client/ktor-client-features/ktor-client-json/ktor-client-serialization/common/src/io/ktor/client/features/json/serializer/KotlinxSerializer.kt

@@ -8,7 +8,7 @@ import io.ktor.client.call.*
 import io.ktor.client.features.json.*
 import io.ktor.http.*
 import io.ktor.http.content.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import kotlinx.serialization.*
 import kotlinx.serialization.internal.*
 import kotlinx.serialization.json.*

ktor-client/ktor-client-features/ktor-client-logging/common/src/io/ktor/client/features/logging/Logging.kt

@@ -14,9 +14,9 @@ import io.ktor.http.*
 import io.ktor.http.content.*
 import io.ktor.util.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.charsets.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.charsets.*
+import io.ktor.utils.io.core.*
 
 /**
  * [HttpClient] logging feature.

ktor-client/ktor-client-features/ktor-client-logging/common/test/io/ktor/client/features/logging/RemoteTests.kt

@@ -7,7 +7,7 @@ package io.ktor.client.features.logging
 import io.ktor.client.request.*
 import io.ktor.client.response.*
 import io.ktor.client.tests.utils.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import kotlin.test.*
 
 class RemoteTests : ClientLoader() {

ktor-client/ktor-client-features/ktor-client-logging/jvm/test/io/ktor/client/features/logging/JvmLoggingTest.kt

@@ -7,7 +7,7 @@ package io.ktor.client.features.logging
 import io.ktor.client.engine.mock.*
 import io.ktor.client.request.forms.*
 import io.ktor.client.tests.utils.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import kotlin.test.*
 
 

ktor-client/ktor-client-features/ktor-client-logging/jvm/test/io/ktor/client/features/logging/NetworkLoggingTest.kt

@@ -10,7 +10,7 @@ import io.ktor.client.response.*
 import io.ktor.client.tests.utils.*
 import io.ktor.http.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import kotlin.test.*
 
 class NetworkLoggingTest : ClientLoader() {

ktor-client/ktor-client-features/ktor-client-websockets/common/test/io/ktor/client/tests/features/WebSocketRemoteTest.kt

@@ -8,7 +8,7 @@ import io.ktor.client.features.websocket.*
 import io.ktor.client.tests.utils.*
 import io.ktor.http.*
 import io.ktor.http.cio.websocket.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import kotlin.test.*
 
 class WebSocketRemoteTest : ClientLoader() {

ktor-client/ktor-client-ios/darwin/src/io/ktor/client/engine/ios/IosClientEngine.kt

@@ -13,8 +13,8 @@ import io.ktor.http.content.*
 import io.ktor.util.date.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.core.*
 import platform.CFNetwork.*
 import platform.Foundation.*
 import platform.darwin.*

ktor-client/ktor-client-jetty/jvm/src/io/ktor/client/engine/jetty/JettyHttpRequest.kt

@@ -13,8 +13,8 @@ import io.ktor.http.content.*
 import io.ktor.util.cio.*
 import io.ktor.util.date.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.pool.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.pool.*
 import org.eclipse.jetty.http.*
 import org.eclipse.jetty.http2.api.*
 import org.eclipse.jetty.http2.client.*

ktor-client/ktor-client-jetty/jvm/src/io/ktor/client/engine/jetty/JettyResponseListener.kt

@@ -8,7 +8,7 @@ import io.ktor.http.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
 import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import org.eclipse.jetty.http.*
 import org.eclipse.jetty.http2.*
 import org.eclipse.jetty.http2.api.*

ktor-client/ktor-client-mock/common/src/io/ktor/client/engine/mock/MockUtils.kt

@@ -10,9 +10,9 @@ import io.ktor.http.content.*
 import io.ktor.util.*
 import io.ktor.util.date.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.charsets.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.charsets.*
+import io.ktor.utils.io.core.*
 import kotlin.coroutines.*
 
 @Suppress("KDocMissingDocumentation")

ktor-client/ktor-client-okhttp/jvm/src/io/ktor/client/engine/okhttp/OkHttpEngine.kt

@@ -12,7 +12,7 @@ import io.ktor.http.content.*
 import io.ktor.util.*
 import io.ktor.util.date.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import kotlinx.io.core.*
 import okhttp3.*
 import okhttp3.internal.http.HttpMethod

ktor-client/ktor-client-okhttp/jvm/src/io/ktor/client/engine/okhttp/StreamRequestBody.kt

@@ -4,8 +4,8 @@
 
 package io.ktor.client.engine.okhttp
 
-import kotlinx.coroutines.io.*
-import kotlinx.coroutines.io.jvm.javaio.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.jvm.javaio.*
 import okhttp3.*
 import okio.*
 

ktor-client/ktor-client-tests/common/src/io/ktor/client/tests/utils/CommonClientTestUtils.kt

@@ -9,7 +9,7 @@ import io.ktor.client.engine.*
 import io.ktor.client.tests.utils.dispatcher.*
 import io.ktor.util.*
 import kotlinx.coroutines.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 
 /**
  * Local test server url.

ktor-client/ktor-client-tests/common/src/io/ktor/client/tests/utils/Generators.kt

@@ -7,8 +7,8 @@ package io.ktor.client.tests.utils
 import io.ktor.http.*
 import io.ktor.http.content.*
 import io.ktor.util.*
-import kotlinx.io.charsets.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.charsets.*
+import io.ktor.utils.io.core.*
 
 
 @InternalAPI

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/CharsetTest.kt

@@ -11,7 +11,7 @@ import io.ktor.client.tests.utils.*
 import io.ktor.client.utils.*
 import io.ktor.http.*
 import io.ktor.http.content.*
-import kotlinx.io.charsets.*
+import io.ktor.utils.io.charsets.*
 import kotlin.test.*
 
 

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/ConnectionTest.kt

@@ -9,7 +9,7 @@ import io.ktor.client.call.*
 import io.ktor.client.response.*
 import io.ktor.client.tests.utils.*
 import io.ktor.http.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import kotlin.test.*
 
 class ConnectionTest : ClientLoader() {

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/ContentTest.kt

@@ -16,9 +16,9 @@ import io.ktor.http.*
 import io.ktor.http.content.*
 import io.ktor.util.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.io.core.*
-import kotlinx.io.core.toByteArray
+import io.ktor.utils.io.*
+import io.ktor.utils.io.core.*
+import io.ktor.utils.io.core.toByteArray
 import kotlin.test.*
 
 class ContentTest : ClientLoader() {

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/DownloadTest.kt

@@ -6,7 +6,7 @@ package io.ktor.client.tests
 
 import io.ktor.client.request.*
 import io.ktor.client.tests.utils.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import kotlin.test.*
 
 class DownloadTest : ClientLoader() {

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/FullFormTest.kt

@@ -11,7 +11,7 @@ import io.ktor.client.tests.utils.*
 import io.ktor.http.*
 import io.ktor.util.*
 import kotlinx.coroutines.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import kotlin.test.*
 
 class FullFormTest : ClientLoader() {

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/HttpBinTest.kt

@@ -10,7 +10,7 @@ import io.ktor.client.features.json.serializer.*
 import io.ktor.client.request.*
 import io.ktor.client.response.*
 import io.ktor.client.tests.utils.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import kotlinx.serialization.*
 import kotlinx.serialization.json.*
 import kotlin.test.*

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/HttpRedirectTest.kt

@@ -10,7 +10,7 @@ import io.ktor.client.request.*
 import io.ktor.client.response.*
 import io.ktor.client.tests.utils.*
 import io.ktor.http.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import kotlin.test.*
 
 class HttpRedirectTest : ClientLoader() {

ktor-client/ktor-client-tests/common/test/io/ktor/client/tests/PostTest.kt

@@ -9,7 +9,7 @@ import io.ktor.client.request.*
 import io.ktor.client.tests.utils.*
 import io.ktor.http.content.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import kotlin.test.*
 
 class PostTest : ClientLoader() {

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

@@ -12,7 +12,7 @@ import io.ktor.request.*
 import io.ktor.response.*
 import io.ktor.routing.*
 import io.ktor.websocket.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 
 internal fun Application.benchmarks() {
     routing {

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

@@ -12,7 +12,8 @@ import io.ktor.request.*
 import io.ktor.response.*
 import io.ktor.routing.*
 import io.ktor.util.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.core.*
 import kotlin.test.*
 
 internal fun Application.contentTestServer() {

ktor-features/ktor-freemarker/jvm/src/io/ktor/freemarker/FreeMarker.kt

@@ -11,7 +11,7 @@ import io.ktor.http.content.*
 import io.ktor.response.*
 import io.ktor.util.*
 import io.ktor.util.cio.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 
 /**
  * Represents a content handled by [FreeMarker] feature.

ktor-features/ktor-gson/jvm/src/io/ktor/gson/GsonSupport.kt

@@ -12,8 +12,8 @@ import io.ktor.http.*
 import io.ktor.http.content.*
 import io.ktor.util.pipeline.*
 import io.ktor.request.*
-import kotlinx.coroutines.io.*
-import kotlinx.coroutines.io.jvm.javaio.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.jvm.javaio.*
 import kotlin.reflect.*
 import kotlin.reflect.jvm.*
 

ktor-features/ktor-html-builder/jvm/src/io/ktor/html/RespondHtml.kt

@@ -9,7 +9,7 @@ import io.ktor.http.*
 import io.ktor.http.content.*
 import io.ktor.response.*
 import io.ktor.util.cio.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import kotlinx.html.*
 import kotlinx.html.stream.*
 

ktor-features/ktor-jackson/jvm/src/io/ktor/jackson/JacksonConverter.kt

@@ -13,8 +13,8 @@ import io.ktor.features.*
 import io.ktor.http.*
 import io.ktor.util.pipeline.*
 import io.ktor.request.*
-import kotlinx.coroutines.io.*
-import kotlinx.coroutines.io.jvm.javaio.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.jvm.javaio.*
 
 /**
  *    install(ContentNegotiation) {

ktor-features/ktor-mustache/jvm/src/io/ktor/mustache/Mustache.kt

@@ -11,7 +11,7 @@ import io.ktor.http.content.*
 import io.ktor.response.*
 import io.ktor.util.*
 import io.ktor.util.cio.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 
 /**
  * Response content which could be used to respond [ApplicationCalls] like `call.respond(MustacheContent(...))

ktor-features/ktor-server-sessions/jvm/src/io/ktor/sessions/CacheStorage.kt

@@ -5,8 +5,8 @@
 package io.ktor.sessions
 
 import io.ktor.util.*
-import kotlinx.coroutines.io.*
-import kotlinx.coroutines.io.jvm.javaio.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.jvm.javaio.*
 
 @Suppress("KDocMissingDocumentation")
 @InternalAPI

ktor-features/ktor-server-sessions/jvm/src/io/ktor/sessions/DirectoryStorage.kt

@@ -7,7 +7,7 @@ package io.ktor.sessions
 import io.ktor.util.*
 import io.ktor.util.cio.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import java.io.*
 
 

ktor-features/ktor-server-sessions/jvm/test/io/ktor/tests/sessions/DirectorySessionStorageTest.kt

@@ -6,8 +6,8 @@ package io.ktor.tests.sessions
 
 import io.ktor.sessions.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
-import kotlinx.coroutines.io.jvm.javaio.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.jvm.javaio.*
 import org.junit.*
 import org.junit.Test
 import java.io.*

ktor-features/ktor-thymeleaf/jvm/src/io/ktor/thymeleaf/Thymeleaf.kt

@@ -15,7 +15,7 @@ import io.ktor.http.withCharset
 import io.ktor.response.ApplicationSendPipeline
 import io.ktor.util.AttributeKey
 import io.ktor.util.cio.bufferedWriter
-import kotlinx.coroutines.io.ByteWriteChannel
+import io.ktor.utils.io.ByteWriteChannel
 import org.thymeleaf.TemplateEngine
 import org.thymeleaf.context.Context
 

ktor-features/ktor-velocity/jvm/src/io/ktor/velocity/Velocity.kt

@@ -10,7 +10,7 @@ import io.ktor.http.content.*
 import io.ktor.response.*
 import io.ktor.util.*
 import io.ktor.util.cio.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import org.apache.velocity.*
 import org.apache.velocity.app.*
 

ktor-features/ktor-webjars/jvm/src/io/ktor/webjars/Webjars.kt

@@ -12,8 +12,8 @@ import io.ktor.response.*
 import io.ktor.util.*
 import io.ktor.util.cio.*
 import io.ktor.util.pipeline.*
-import kotlinx.coroutines.io.*
-import kotlinx.coroutines.io.jvm.javaio.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.jvm.javaio.*
 import org.webjars.*
 import java.io.*
 import java.nio.file.*

ktor-features/ktor-websockets/jvm/src/io/ktor/websocket/Durations.kt

@@ -8,7 +8,7 @@ import io.ktor.util.cio.*
 import io.ktor.websocket.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
-import kotlinx.io.pool.*
+import io.ktor.utils.io.pool.*
 import java.nio.*
 import java.time.*
 

ktor-features/ktor-websockets/jvm/src/io/ktor/websocket/WebSocketUpgrade.kt

@@ -11,7 +11,7 @@ import io.ktor.http.cio.websocket.*
 import io.ktor.http.websocket.*
 import io.ktor.request.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import kotlin.coroutines.*
 
 /**

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

@@ -15,7 +15,7 @@ import io.ktor.websocket.*
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
 import kotlinx.coroutines.debug.junit4.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 import org.junit.*
 import org.junit.Test
 import java.nio.*

ktor-features/ktor-websockets/jvm/test/io/ktor/tests/websocket/WriterTest.kt

@@ -7,7 +7,7 @@ package io.ktor.tests.websocket
 import io.ktor.util.cio.*
 import io.ktor.http.cio.websocket.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import org.junit.Test
 import java.nio.ByteBuffer
 import kotlin.test.*

ktor-http/common/src/io/ktor/http/Codecs.kt

@@ -4,8 +4,8 @@
 package io.ktor.http
 
 import io.ktor.util.*
-import kotlinx.io.charsets.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.charsets.*
+import io.ktor.utils.io.core.*
 
 private val URL_ALPHABET = (('a'..'z') + ('A'..'Z') + ('0'..'9')).map { it.toByte() }
 private val URL_ALPHABET_CHARS = (('a'..'z') + ('A'..'Z') + ('0'..'9'))

ktor-http/common/src/io/ktor/http/ContentTypes.kt

@@ -4,7 +4,7 @@
 
 package io.ktor.http
 
-import kotlinx.io.charsets.*
+import io.ktor.utils.io.charsets.*
 
 /**
  * Represents a value for a `Content-Type` header.

ktor-http/common/src/io/ktor/http/FileContentType.kt

@@ -5,7 +5,7 @@
 package io.ktor.http
 
 import io.ktor.util.*
-import kotlinx.io.charsets.*
+import io.ktor.utils.io.charsets.*
 
 /**
  * Default [ContentType] for [extension]

ktor-http/common/src/io/ktor/http/HttpMessageProperties.kt

@@ -6,7 +6,7 @@
 
 package io.ktor.http
 
-import kotlinx.io.charsets.*
+import io.ktor.utils.io.charsets.*
 
 /**
  * Set `Content-Type` header.

ktor-http/common/src/io/ktor/http/HttpUrlEncoded.kt

@@ -5,7 +5,7 @@
 package io.ktor.http
 
 import io.ktor.util.*
-import kotlinx.io.charsets.*
+import io.ktor.utils.io.charsets.*
 
 /**
  * Parse URL query parameters. Shouldn't be used for urlencoded forms because of `+` character.

ktor-http/common/src/io/ktor/http/auth/HttpAuthHeader.kt

@@ -6,7 +6,7 @@ package io.ktor.http.auth
 
 import io.ktor.http.*
 import io.ktor.util.*
-import kotlinx.io.charsets.*
+import io.ktor.utils.io.charsets.*
 
 private const val valuePatternPart = """("((\\.)|[^\\"])*")|[^\s,]*"""
 

ktor-http/common/src/io/ktor/http/content/Multipart.kt

@@ -5,7 +5,7 @@
 package io.ktor.http.content
 
 import io.ktor.http.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.core.*
 
 /**
  * Represents a multipart/form-data entry. Could be a [FormItem] or [FileItem]

ktor-http/common/src/io/ktor/http/content/OutgoingContent.kt

@@ -7,7 +7,7 @@ package io.ktor.http.content
 import io.ktor.http.*
 import io.ktor.util.*
 import kotlinx.coroutines.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import kotlin.coroutines.*
 
 /**

ktor-http/common/src/io/ktor/http/content/TextContent.kt

@@ -5,8 +5,8 @@
 package io.ktor.http.content
 
 import io.ktor.http.*
-import kotlinx.io.charsets.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.charsets.*
+import io.ktor.utils.io.core.*
 
 /**
  * Represents a text content that could be sent

ktor-http/common/src/io/ktor/http/websocket/Utils.kt

@@ -5,8 +5,8 @@
 package io.ktor.http.websocket
 
 import io.ktor.util.*
-import kotlinx.io.charsets.*
-import kotlinx.io.core.*
+import io.ktor.utils.io.charsets.*
+import io.ktor.utils.io.core.*
 
 
 private const val WEBSOCKET_SERVER_ACCEPT_TAIL = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"

ktor-http/jvm/src/io/ktor/http/content/OutputStreamContent.kt

@@ -5,8 +5,8 @@
 package io.ktor.http.content
 
 import io.ktor.http.*
-import kotlinx.coroutines.io.*
-import kotlinx.coroutines.io.jvm.javaio.*
+import io.ktor.utils.io.*
+import io.ktor.utils.io.jvm.javaio.*
 import java.io.*
 
 /**

ktor-http/jvm/src/io/ktor/http/content/URIFileContent.kt

@@ -7,7 +7,7 @@ package io.ktor.http.content
 import io.ktor.http.*
 import io.ktor.util.*
 import io.ktor.util.cio.*
-import kotlinx.coroutines.io.jvm.javaio.*
+import io.ktor.utils.io.jvm.javaio.*
 import java.net.*
 
 /**

ktor-http/jvm/src/io/ktor/http/content/WriterContent.kt

@@ -6,7 +6,7 @@ package io.ktor.http.content
 
 import io.ktor.http.*
 import io.ktor.util.cio.*
-import kotlinx.coroutines.io.*
+import io.ktor.utils.io.*
 import java.io.*
 
 /**