From f6c1fc4f70e6f6d6ac1b45ee40c1627420a4df57 Mon Sep 17 00:00:00 2001
From: Ivan Migalev <ivan.migalev@jetbrains.com>
Date: Tue, 18 Feb 2025 17:56:53 +0100
Subject: [PATCH] Revert "Replace transitive dependency on kotlinx-io-core with
 a direct one"

This reverts commit 4309b698141bed71257ec99a9e7f5151d38d4650.

GitOrigin-RevId: 53297e9e2bb858a6c1eb561431e2d31e2db77d9d
---
 .idea/libraries/ktor_client.xml               | 11 ++++++++-
 .idea/libraries/ktor_client_cio.xml           | 11 ++++++++-
 .idea/libraries/ktor_client_core.xml          | 23 +++++++++----------
 .idea/libraries/ktor_client_mock.xml          | 11 ++++++++-
 .idea/libraries/ktor_network_tls.xml          | 11 ++++++++-
 .idea/libraries/ktor_server_cio.xml           | 11 ++++++++-
 java/idea-ui/intellij.java.ui.tests.iml       |  1 -
 .../intellij.libraries.ktor.client.iml        |  1 -
 .../intellij.platform.buildScripts.iml        |  1 -
 .../intellij.platform.durability.iml          |  1 -
 .../intellij.platform.tests.iml               |  1 -
 .../util/http/intellij.platform.util.http.iml |  1 -
 .../wsl-impl/intellij.platform.wsl.impl.iml   |  1 -
 .../intellij.evaluationPlugin.iml             |  1 -
 .../intellij.repository.search.iml            |  1 -
 15 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/.idea/libraries/ktor_client.xml b/.idea/libraries/ktor_client.xml
index a2a3a80515e2..866aa0c07fc7 100644
--- a/.idea/libraries/ktor_client.xml
+++ b/.idea/libraries/ktor_client.xml
@@ -14,6 +14,12 @@
         <artifact url="file://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3.jar">
           <sha256sum>587f6aa4a22daf484ebb84ee5513f1b898e0feeeac714bd2fe0dd2232f57ade5</sha256sum>
         </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar">
+          <sha256sum>dc3587c12795af01231591c0ef09a4139dfca8113c2989273b96b958006853c3</sha256sum>
+        </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar">
+          <sha256sum>1fc96e19b445387dbc49183d0cc623c5a61bfa47c86cf81aaf5aff4845154fab</sha256sum>
+        </artifact>
         <artifact url="file://$MAVEN_REPOSITORY$/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3.jar">
           <sha256sum>317ee7adeb43e197717a5ab61fa3d8761514805ca0bcff49de029c4d6f2b3df2</sha256sum>
         </artifact>
@@ -33,7 +39,6 @@
       <exclude>
         <dependency maven-id="org.slf4j:slf4j-api" />
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm" />
-        <dependency maven-id="org.jetbrains.kotlinx:kotlinx-io-core-jvm" />
         <dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib" />
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-serialization-core-jvm" />
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-coroutines-slf4j" />
@@ -44,6 +49,8 @@
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-http-jvm/3.0.3/ktor-http-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-utils-jvm/3.0.3/ktor-utils-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websocket-serialization-jvm/3.0.3/ktor-websocket-serialization-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-serialization-jvm/3.0.3/ktor-serialization-jvm-3.0.3.jar!/" />
@@ -56,6 +63,8 @@
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-http-jvm/3.0.3/ktor-http-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-utils-jvm/3.0.3/ktor-utils-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websocket-serialization-jvm/3.0.3/ktor-websocket-serialization-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-serialization-jvm/3.0.3/ktor-serialization-jvm-3.0.3-sources.jar!/" />
diff --git a/.idea/libraries/ktor_client_cio.xml b/.idea/libraries/ktor_client_cio.xml
index 958b472f8745..b66e0ae91b28 100644
--- a/.idea/libraries/ktor_client_cio.xml
+++ b/.idea/libraries/ktor_client_cio.xml
@@ -32,6 +32,12 @@
         <artifact url="file://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3.jar">
           <sha256sum>587f6aa4a22daf484ebb84ee5513f1b898e0feeeac714bd2fe0dd2232f57ade5</sha256sum>
         </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar">
+          <sha256sum>dc3587c12795af01231591c0ef09a4139dfca8113c2989273b96b958006853c3</sha256sum>
+        </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar">
+          <sha256sum>1fc96e19b445387dbc49183d0cc623c5a61bfa47c86cf81aaf5aff4845154fab</sha256sum>
+        </artifact>
         <artifact url="file://$MAVEN_REPOSITORY$/io/ktor/ktor-websockets-jvm/3.0.3/ktor-websockets-jvm-3.0.3.jar">
           <sha256sum>4ecb08d33dc0d7c9d6b943b2b3e706f3d55fabef584b0c72fb2f0c5ba8a0eb7a</sha256sum>
         </artifact>
@@ -48,7 +54,6 @@
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-serialization-core-jvm" />
         <dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib" />
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-coroutines-slf4j" />
-        <dependency maven-id="org.jetbrains.kotlinx:kotlinx-io-core-jvm" />
       </exclude>
     </properties>
     <CLASSES>
@@ -62,6 +67,8 @@
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-http-cio-jvm/3.0.3/ktor-http-cio-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-network-jvm/3.0.3/ktor-network-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websockets-jvm/3.0.3/ktor-websockets-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-network-tls-jvm/3.0.3/ktor-network-tls-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-utils-jvm/3.0.3/ktor-utils-jvm-3.0.3.jar!/" />
@@ -78,6 +85,8 @@
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-http-cio-jvm/3.0.3/ktor-http-cio-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-network-jvm/3.0.3/ktor-network-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websockets-jvm/3.0.3/ktor-websockets-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-network-tls-jvm/3.0.3/ktor-network-tls-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-utils-jvm/3.0.3/ktor-utils-jvm-3.0.3-sources.jar!/" />
diff --git a/.idea/libraries/ktor_client_core.xml b/.idea/libraries/ktor_client_core.xml
index 8a40722c2665..a5367d824327 100644
--- a/.idea/libraries/ktor_client_core.xml
+++ b/.idea/libraries/ktor_client_core.xml
@@ -14,6 +14,12 @@
         <artifact url="file://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3.jar">
           <sha256sum>587f6aa4a22daf484ebb84ee5513f1b898e0feeeac714bd2fe0dd2232f57ade5</sha256sum>
         </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar">
+          <sha256sum>dc3587c12795af01231591c0ef09a4139dfca8113c2989273b96b958006853c3</sha256sum>
+        </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar">
+          <sha256sum>1fc96e19b445387dbc49183d0cc623c5a61bfa47c86cf81aaf5aff4845154fab</sha256sum>
+        </artifact>
         <artifact url="file://$MAVEN_REPOSITORY$/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3.jar">
           <sha256sum>317ee7adeb43e197717a5ab61fa3d8761514805ca0bcff49de029c4d6f2b3df2</sha256sum>
         </artifact>
@@ -33,7 +39,6 @@
       <exclude>
         <dependency maven-id="org.slf4j:slf4j-api" />
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm" />
-        <dependency maven-id="org.jetbrains.kotlinx:kotlinx-io-core-jvm" />
         <dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib" />
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-serialization-core-jvm" />
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-coroutines-slf4j" />
@@ -44,28 +49,22 @@
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-http-jvm/3.0.3/ktor-http-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-utils-jvm/3.0.3/ktor-utils-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websocket-serialization-jvm/3.0.3/ktor-websocket-serialization-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-serialization-jvm/3.0.3/ktor-serialization-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websockets-jvm/3.0.3/ktor-websockets-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-sse-jvm/3.0.3/ktor-sse-jvm-3.0.3.jar!/" />
     </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-client-core-jvm/3.0.3/ktor-client-core-jvm-3.0.3-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-http-jvm/3.0.3/ktor-http-jvm-3.0.3-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-utils-jvm/3.0.3/ktor-utils-jvm-3.0.3-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websocket-serialization-jvm/3.0.3/ktor-websocket-serialization-jvm-3.0.3-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-serialization-jvm/3.0.3/ktor-serialization-jvm-3.0.3-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websockets-jvm/3.0.3/ktor-websockets-jvm-3.0.3-javadoc.jar!/" />
-      <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-sse-jvm/3.0.3/ktor-sse-jvm-3.0.3-javadoc.jar!/" />
-    </JAVADOC>
+    <JAVADOC />
     <SOURCES>
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-client-core-jvm/3.0.3/ktor-client-core-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-http-jvm/3.0.3/ktor-http-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-utils-jvm/3.0.3/ktor-utils-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websocket-serialization-jvm/3.0.3/ktor-websocket-serialization-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-serialization-jvm/3.0.3/ktor-serialization-jvm-3.0.3-sources.jar!/" />
diff --git a/.idea/libraries/ktor_client_mock.xml b/.idea/libraries/ktor_client_mock.xml
index a3d6aa3143ba..fde0b43617da 100644
--- a/.idea/libraries/ktor_client_mock.xml
+++ b/.idea/libraries/ktor_client_mock.xml
@@ -14,6 +14,12 @@
         <artifact url="file://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3.jar">
           <sha256sum>587f6aa4a22daf484ebb84ee5513f1b898e0feeeac714bd2fe0dd2232f57ade5</sha256sum>
         </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar">
+          <sha256sum>dc3587c12795af01231591c0ef09a4139dfca8113c2989273b96b958006853c3</sha256sum>
+        </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar">
+          <sha256sum>1fc96e19b445387dbc49183d0cc623c5a61bfa47c86cf81aaf5aff4845154fab</sha256sum>
+        </artifact>
         <artifact url="file://$MAVEN_REPOSITORY$/io/ktor/ktor-client-core-jvm/3.0.3/ktor-client-core-jvm-3.0.3.jar">
           <sha256sum>e3d174d16548023805041b29a42fb135bfe3182534d3bf9f839d5821337f8d69</sha256sum>
         </artifact>
@@ -36,7 +42,6 @@
       <exclude>
         <dependency maven-id="org.slf4j:slf4j-api" />
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm" />
-        <dependency maven-id="org.jetbrains.kotlinx:kotlinx-io-core-jvm" />
         <dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib" />
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-serialization-core-jvm" />
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-coroutines-slf4j" />
@@ -47,6 +52,8 @@
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-http-jvm/3.0.3/ktor-http-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-utils-jvm/3.0.3/ktor-utils-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-client-core-jvm/3.0.3/ktor-client-core-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websocket-serialization-jvm/3.0.3/ktor-websocket-serialization-jvm-3.0.3.jar!/" />
@@ -60,6 +67,8 @@
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-http-jvm/3.0.3/ktor-http-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-utils-jvm/3.0.3/ktor-utils-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-client-core-jvm/3.0.3/ktor-client-core-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websocket-serialization-jvm/3.0.3/ktor-websocket-serialization-jvm-3.0.3-sources.jar!/" />
diff --git a/.idea/libraries/ktor_network_tls.xml b/.idea/libraries/ktor_network_tls.xml
index 0b7ecdf093e1..efcde1982214 100644
--- a/.idea/libraries/ktor_network_tls.xml
+++ b/.idea/libraries/ktor_network_tls.xml
@@ -17,13 +17,18 @@
         <artifact url="file://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3.jar">
           <sha256sum>587f6aa4a22daf484ebb84ee5513f1b898e0feeeac714bd2fe0dd2232f57ade5</sha256sum>
         </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar">
+          <sha256sum>dc3587c12795af01231591c0ef09a4139dfca8113c2989273b96b958006853c3</sha256sum>
+        </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar">
+          <sha256sum>1fc96e19b445387dbc49183d0cc623c5a61bfa47c86cf81aaf5aff4845154fab</sha256sum>
+        </artifact>
       </verification>
       <exclude>
         <dependency maven-id="org.slf4j:slf4j-api" />
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm" />
         <dependency maven-id="org.jetbrains.kotlinx:kotlinx-serialization-core-jvm" />
         <dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib" />
-        <dependency maven-id="org.jetbrains.kotlinx:kotlinx-io-core-jvm" />
       </exclude>
     </properties>
     <CLASSES>
@@ -32,6 +37,8 @@
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-network-jvm/3.0.3/ktor-network-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-utils-jvm/3.0.3/ktor-utils-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
@@ -40,6 +47,8 @@
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-network-jvm/3.0.3/ktor-network-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-utils-jvm/3.0.3/ktor-utils-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4-sources.jar!/" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/.idea/libraries/ktor_server_cio.xml b/.idea/libraries/ktor_server_cio.xml
index fe02d8af71bb..84b6787b653f 100644
--- a/.idea/libraries/ktor_server_cio.xml
+++ b/.idea/libraries/ktor_server_cio.xml
@@ -29,6 +29,12 @@
         <artifact url="file://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3.jar">
           <sha256sum>587f6aa4a22daf484ebb84ee5513f1b898e0feeeac714bd2fe0dd2232f57ade5</sha256sum>
         </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar">
+          <sha256sum>dc3587c12795af01231591c0ef09a4139dfca8113c2989273b96b958006853c3</sha256sum>
+        </artifact>
+        <artifact url="file://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar">
+          <sha256sum>1fc96e19b445387dbc49183d0cc623c5a61bfa47c86cf81aaf5aff4845154fab</sha256sum>
+        </artifact>
         <artifact url="file://$MAVEN_REPOSITORY$/io/ktor/ktor-websockets-jvm/3.0.3/ktor-websockets-jvm-3.0.3.jar">
           <sha256sum>4ecb08d33dc0d7c9d6b943b2b3e706f3d55fabef584b0c72fb2f0c5ba8a0eb7a</sha256sum>
         </artifact>
@@ -43,7 +49,6 @@
         <dependency maven-id="org.jetbrains.kotlin:kotlin-stdlib" />
         <dependency maven-id="org.jetbrains.kotlin:kotlin-reflect" />
         <dependency maven-id="org.fusesource.jansi:jansi" />
-        <dependency maven-id="org.jetbrains.kotlinx:kotlinx-io-core-jvm" />
       </exclude>
     </properties>
     <CLASSES>
@@ -56,6 +61,8 @@
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-http-cio-jvm/3.0.3/ktor-http-cio-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websockets-jvm/3.0.3/ktor-websockets-jvm-3.0.3.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-network-jvm/3.0.3/ktor-network-jvm-3.0.3.jar!/" />
     </CLASSES>
@@ -70,6 +77,8 @@
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-http-cio-jvm/3.0.3/ktor-http-cio-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-io-jvm/3.0.3/ktor-io-jvm-3.0.3-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4-sources.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-websockets-jvm/3.0.3/ktor-websockets-jvm-3.0.3-sources.jar!/" />
       <root url="jar://$MAVEN_REPOSITORY$/io/ktor/ktor-network-jvm/3.0.3/ktor-network-jvm-3.0.3-sources.jar!/" />
     </SOURCES>
diff --git a/java/idea-ui/intellij.java.ui.tests.iml b/java/idea-ui/intellij.java.ui.tests.iml
index c8192fca0212..9557c324c944 100644
--- a/java/idea-ui/intellij.java.ui.tests.iml
+++ b/java/idea-ui/intellij.java.ui.tests.iml
@@ -26,7 +26,6 @@
     <orderEntry type="library" name="kotlin-test" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="ktor-server-cio" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlinx-io-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5.eel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.eel.provider" scope="TEST" />
   </component>
diff --git a/libraries/ktor-client/intellij.libraries.ktor.client.iml b/libraries/ktor-client/intellij.libraries.ktor.client.iml
index f20ac99a419c..4e8bf1debe8a 100644
--- a/libraries/ktor-client/intellij.libraries.ktor.client.iml
+++ b/libraries/ktor-client/intellij.libraries.ktor.client.iml
@@ -13,6 +13,5 @@
     <orderEntry type="library" exported="" name="ktor-client-content-negotiation" level="project" />
     <orderEntry type="library" exported="" name="ktor-serialization-kotlinx-json" level="project" />
     <orderEntry type="library" exported="" name="ktor-client-auth" level="project" />
-    <orderEntry type="library" name="kotlinx-io-core" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/build-scripts/intellij.platform.buildScripts.iml b/platform/build-scripts/intellij.platform.buildScripts.iml
index 0ad04e285c46..c9e780dfa913 100644
--- a/platform/build-scripts/intellij.platform.buildScripts.iml
+++ b/platform/build-scripts/intellij.platform.buildScripts.iml
@@ -241,7 +241,6 @@
     <orderEntry type="module" module-name="intellij.platform.boot" />
     <orderEntry type="module" module-name="intellij.platform.ijent.community.buildConstants" />
     <orderEntry type="library" name="ktor-client-core" level="project" />
-    <orderEntry type="library" name="kotlinx-io-core" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="snakeyaml" level="project" />
     <orderEntry type="library" name="netty" level="project" />
     <orderEntry type="library" name="netty-tcnative-boringssl" level="project" />
diff --git a/platform/platform-tests/durability/intellij.platform.durability.iml b/platform/platform-tests/durability/intellij.platform.durability.iml
index 114fec12c909..a63c833b73d0 100644
--- a/platform/platform-tests/durability/intellij.platform.durability.iml
+++ b/platform/platform-tests/durability/intellij.platform.durability.iml
@@ -31,7 +31,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="library" scope="TEST" name="ktor-network-tls" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlinx-io-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="library" scope="TEST" name="kotlinx-serialization-core" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinx-serialization-json" level="project" />
diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml
index 142f4eeee74c..63dc7a03f721 100644
--- a/platform/platform-tests/intellij.platform.tests.iml
+++ b/platform/platform-tests/intellij.platform.tests.iml
@@ -108,7 +108,6 @@
     <orderEntry type="library" name="kotlinx-collections-immutable" level="project" />
     <orderEntry type="module" module-name="intellij.platform.buildData" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="ktor-server-cio" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlinx-io-core" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ui.jcef" scope="TEST" />
     <orderEntry type="library" scope="TEST" name="rhino" level="project" />
     <orderEntry type="module" module-name="intellij.platform.eel.impl" />
diff --git a/platform/util/http/intellij.platform.util.http.iml b/platform/util/http/intellij.platform.util.http.iml
index 616a6c6c767d..18e5a83fcbf7 100644
--- a/platform/util/http/intellij.platform.util.http.iml
+++ b/platform/util/http/intellij.platform.util.http.iml
@@ -27,7 +27,6 @@
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="jetbrains-annotations" level="project" />
     <orderEntry type="library" name="ktor-client-core" level="project" />
-    <orderEntry type="library" name="kotlinx-io-core" level="project" />
     <orderEntry type="library" name="ktor-client-java" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/wsl-impl/intellij.platform.wsl.impl.iml b/platform/wsl-impl/intellij.platform.wsl.impl.iml
index 9e383d3cd418..e105030a6682 100644
--- a/platform/wsl-impl/intellij.platform.wsl.impl.iml
+++ b/platform/wsl-impl/intellij.platform.wsl.impl.iml
@@ -16,6 +16,5 @@
     <orderEntry type="library" name="lz4-java" level="project" />
     <orderEntry type="module" module-name="intellij.platform.util.ex" />
     <orderEntry type="library" name="ktor-network-tls" level="project" />
-    <orderEntry type="library" name="kotlinx-io-core" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/evaluation-plugin/intellij.evaluationPlugin.iml b/plugins/evaluation-plugin/intellij.evaluationPlugin.iml
index f94ce0610c4a..377a596ff957 100644
--- a/plugins/evaluation-plugin/intellij.evaluationPlugin.iml
+++ b/plugins/evaluation-plugin/intellij.evaluationPlugin.iml
@@ -28,7 +28,6 @@
     <orderEntry type="library" name="kotlinx-coroutines-core" level="project" />
     <orderEntry type="library" name="jetbrains-annotations" level="project" />
     <orderEntry type="library" name="ktor-client-core" level="project" />
-    <orderEntry type="library" name="kotlinx-io-core" level="project" />
     <orderEntry type="library" name="ktor-client-java" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/repository-search/intellij.repository.search.iml b/plugins/repository-search/intellij.repository.search.iml
index 1c1a9b928914..dd68a599eb5a 100644
--- a/plugins/repository-search/intellij.repository.search.iml
+++ b/plugins/repository-search/intellij.repository.search.iml
@@ -50,7 +50,6 @@
     <orderEntry type="library" name="ktor-client-logging" level="project" />
     <orderEntry type="library" name="kotlinx-coroutines-slf4j" level="project" />
     <orderEntry type="library" scope="TEST" name="ktor-client-mock" level="project" />
-    <orderEntry type="library" scope="TEST" name="kotlinx-io-core" level="project" />
     <orderEntry type="library" scope="TEST" name="kotlinx-coroutines-test" level="project" />
     <orderEntry type="module" module-name="intellij.libraries.ktor.client" />
     <orderEntry type="library" exported="" name="package-search-api-client" level="project" />