From 2e1adf2172c949883ac7f8393951526478f4db55 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Wed, 1 Oct 2025 19:48:48 +0200 Subject: [PATCH] IJPL-209419 don't pack libs that are part of the product modules - extract intellij.libraries.ktor.network.tls GitOrigin-RevId: cbaf43a02bcab4c390a89912366b0ff3580534f2 --- .idea/libraries/ktor_client_core.xml | 21 ++------ .idea/libraries/ktor_network_tls.xml | 19 +------ .../ktor_serialization_kotlinx_json.xml | 10 +--- .idea/modules.xml | 7 ++- build/bazel-generated-file-list.txt | 7 ++- lib/BUILD.bazel | 34 +++++++++---- libraries/coil/BUILD.bazel | 2 +- .../io/intellij.libraries.kotlinx.io.iml | 2 +- .../intellij.libraries.ktor.client.cio.iml | 51 ------------------- .../client-cio}/BUILD.bazel | 12 +++-- .../intellij.libraries.ktor.client.cio.iml | 31 +++++++++++ .../intellij.libraries.ktor.client.cio.xml | 1 + .../{ktor-client => ktor/client}/BUILD.bazel | 11 ++-- .../intellij.libraries.ktor.client.iml | 5 +- .../intellij.libraries.ktor.client.xml | 6 +++ libraries/ktor/io/BUILD.bazel | 18 +++++++ .../ktor/io/intellij.libraries.ktor.io.iml | 29 +++++++++++ .../resources/intellij.libraries.ktor.io.xml | 5 ++ libraries/ktor/network-tls/BUILD.bazel | 21 ++++++++ .../intellij.libraries.ktor.network.tls.iml | 13 +++++ .../intellij.libraries.ktor.network.tls.xml} | 0 libraries/ktor/utils/BUILD.bazel | 18 +++++++ .../utils/intellij.libraries.ktor.utils.iml | 40 +++++++++++++++ .../intellij.libraries.ktor.utils.xml | 5 ++ platform/build-scripts/downloader/BUILD.bazel | 8 ++- ...ellij.platform.buildScripts.downloader.iml | 6 +-- .../build/impl/libraries/libraries.kt | 3 ++ .../markdown/extensions/images/BUILD.bazel | 4 +- .../src/META-INF/essential-libs.xml | 6 +-- .../src/META-INF/essential-modules.xml | 1 + .../src/META-INF/ktor-libs.xml | 9 ++++ platform/util/http/BUILD.bazel | 2 +- platform/wsl-impl/BUILD.bazel | 5 +- .../wsl-impl/intellij.platform.wsl.impl.iml | 5 +- plugins/evaluation-plugin/BUILD.bazel | 2 +- plugins/mcp-server/BUILD.bazel | 12 +++-- plugins/mcp-server/intellij.mcpserver.iml | 2 + .../mcp-server/mcpserver.stdio/BUILD.bazel | 2 +- .../mcp-server/resources/META-INF/plugin.xml | 2 + plugins/repository-search/BUILD.bazel | 4 +- .../src/main/resources/META-INF/plugin.xml | 1 + 41 files changed, 293 insertions(+), 149 deletions(-) delete mode 100644 libraries/ktor-client-cio/intellij.libraries.ktor.client.cio.iml rename libraries/{ktor-client-cio => ktor/client-cio}/BUILD.bazel (62%) create mode 100644 libraries/ktor/client-cio/intellij.libraries.ktor.client.cio.iml rename libraries/{ktor-client-cio => ktor/client-cio}/resources/intellij.libraries.ktor.client.cio.xml (78%) rename libraries/{ktor-client => ktor/client}/BUILD.bazel (83%) rename libraries/{ktor-client => ktor/client}/intellij.libraries.ktor.client.iml (80%) create mode 100644 libraries/ktor/client/resources/intellij.libraries.ktor.client.xml create mode 100644 libraries/ktor/io/BUILD.bazel create mode 100644 libraries/ktor/io/intellij.libraries.ktor.io.iml create mode 100644 libraries/ktor/io/resources/intellij.libraries.ktor.io.xml create mode 100644 libraries/ktor/network-tls/BUILD.bazel create mode 100644 libraries/ktor/network-tls/intellij.libraries.ktor.network.tls.iml rename libraries/{ktor-client/resources/intellij.libraries.ktor.client.xml => ktor/network-tls/resources/intellij.libraries.ktor.network.tls.xml} (100%) create mode 100644 libraries/ktor/utils/BUILD.bazel create mode 100644 libraries/ktor/utils/intellij.libraries.ktor.utils.iml create mode 100644 libraries/ktor/utils/resources/intellij.libraries.ktor.utils.xml create mode 100644 platform/platform-resources/src/META-INF/ktor-libs.xml diff --git a/.idea/libraries/ktor_client_core.xml b/.idea/libraries/ktor_client_core.xml index 080ea20e5fcc..2e8b9d888f10 100644 --- a/.idea/libraries/ktor_client_core.xml +++ b/.idea/libraries/ktor_client_core.xml @@ -8,18 +8,9 @@ 8a50d94b46f91bd56580b9169272d6cd636f442032ba078a141da70413465946 - - 33333937b98fc0c8e943ee4b10b3ea66b49782dfb569c44c142da4f32d85dffc - b04aede18e9c008168096dc53a3fc016177b61a5ec3024afbf8caca0cd5dbf42 - - fa4e6165b5ad4bf5db337ebd5f16f9b596dc5e401fbea343b9deacb6138240af - - - bb2fb6c00afaa34b539cb30e7584d37bfcba171c266bbdb9990e003579dc24c1 - da7069c6e78809d7c37d104e415613cbd4cd5cec1ed54a332cb64ef6a864a060 @@ -39,19 +30,18 @@ - - + + + + - - - @@ -62,10 +52,7 @@ - - - diff --git a/.idea/libraries/ktor_network_tls.xml b/.idea/libraries/ktor_network_tls.xml index 382e3692bb28..737bd43aa986 100644 --- a/.idea/libraries/ktor_network_tls.xml +++ b/.idea/libraries/ktor_network_tls.xml @@ -5,41 +5,26 @@ f67507a3e8bf52aa08d753682e6cdda0194e3abe750118b99c9336953e598be9 - - 8a50d94b46f91bd56580b9169272d6cd636f442032ba078a141da70413465946 - fa4e6165b5ad4bf5db337ebd5f16f9b596dc5e401fbea343b9deacb6138240af - - 33333937b98fc0c8e943ee4b10b3ea66b49782dfb569c44c142da4f32d85dffc - - - bb2fb6c00afaa34b539cb30e7584d37bfcba171c266bbdb9990e003579dc24c1 - - + + - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/ktor_serialization_kotlinx_json.xml b/.idea/libraries/ktor_serialization_kotlinx_json.xml index a9fa45335620..3d4434e1ee73 100644 --- a/.idea/libraries/ktor_serialization_kotlinx_json.xml +++ b/.idea/libraries/ktor_serialization_kotlinx_json.xml @@ -8,17 +8,13 @@ b4dc2f9d4d1dda8d481a054d7f833ba195f064f5115fde3ab0dfdb8b42f61fda - - 0d704bc1148a8fd9a1f2005e0b5189cdaed3030efe24b8236459c41c356f5620 - - - - + + @@ -26,13 +22,11 @@ - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 546e72ab6c67..a1e93f5c5ad6 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -648,8 +648,11 @@ - - + + + + + diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index c8597af09507..066450342957 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -359,8 +359,11 @@ libraries/kotlin-test libraries/kotlin-test-assertions-core-jvm libraries/kotlinx/serialization/core libraries/kotlinx/serialization/json -libraries/ktor-client -libraries/ktor-client-cio +libraries/ktor/client +libraries/ktor/client-cio +libraries/ktor/io +libraries/ktor/network-tls +libraries/ktor/utils libraries/lucene.common libraries/microba libraries/mockito diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 10b40550f3ee..68cd05522d25 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -4180,10 +4180,7 @@ java_library( exports = [ ":io_ktor-ktor-client-core-jvm-3_1_3_http_import", ":io_ktor-ktor-http-jvm-3_1_3_http_import", - ":io_ktor-ktor-utils-jvm-3_1_3_http_import", ":io_ktor-ktor-http-cio-jvm-3_1_3_http_import", - ":io_ktor-ktor-network-jvm-3_1_3_http_import", - ":io_ktor-ktor-io-jvm-3_1_3_http_import", ":io_ktor-ktor-events-jvm-3_1_3_http_import", ":io_ktor-ktor-websocket-serialization-jvm-3_1_3_http_import", ":io_ktor-ktor-serialization-jvm-3_1_3_http_import", @@ -4250,10 +4247,7 @@ java_library( name = "ktor-network-tls", exports = [ ":io_ktor-ktor-network-tls-jvm-3_1_3_http_import", - ":io_ktor-ktor-http-jvm-3_1_3_http_import", ":io_ktor-ktor-network-jvm-3_1_3_http_import", - ":io_ktor-ktor-utils-jvm-3_1_3_http_import", - ":io_ktor-ktor-io-jvm-3_1_3_http_import", ], visibility = ["//visibility:public"] ) @@ -4263,7 +4257,6 @@ java_library( exports = [ ":io_ktor-ktor-serialization-kotlinx-json-jvm-3_1_3_http_import", ":io_ktor-ktor-serialization-kotlinx-jvm-3_1_3_http_import", - ":io_ktor-ktor-serialization-jvm-3_1_3_http_import", ], visibility = ["//visibility:public"] ) @@ -5163,16 +5156,35 @@ jvm_import( visibility = ["//visibility:public"] ) -java_library( +jvm_import( name = "libraries-ktor-client-cio-ktor-client-cio-internal", + jar = "@io_ktor-ktor-client-cio-jvm-3_1_3_http//file", + source_jar = "@io_ktor-ktor-client-cio-jvm-3_1_3_http//file", + visibility = ["//visibility:public"] +) + +jvm_import( + name = "libraries-ktor-io-ktor-io", + jar = "@io_ktor-ktor-io-jvm-3_1_3_http//file", + source_jar = "@io_ktor-ktor-io-jvm-3_1_3_http//file", + visibility = ["//visibility:public"] +) + +java_library( + name = "libraries-ktor-utils-ktor-utils", exports = [ - ":io_ktor-ktor-client-cio-jvm-3_1_3_http_import", - ":io_ktor-ktor-http-cio-jvm-3_1_3_http_import", - ":io_ktor-ktor-network-tls-jvm-3_1_3_http_import", + ":io_ktor-ktor-utils-jvm-3_1_3_http_import", + ":org_jetbrains_kotlinx-kotlinx-serialization-core-jvm-1_8_1_http_import", ], visibility = ["//visibility:public"] ) +jvm_import( + name = "org_jetbrains_kotlinx-kotlinx-serialization-core-jvm-1_8_1_http_import", + jar = "@org_jetbrains_kotlinx-kotlinx-serialization-core-jvm-1_8_1_http//file", + source_jar = "@org_jetbrains_kotlinx-kotlinx-serialization-core-jvm-1_8_1_http//file" +) + jvm_import( name = "libraries-skiko-jetbrains-skiko-awt-compose", jar = "@org_jetbrains_skiko-skiko-awt-0_9_24_http//file", diff --git a/libraries/coil/BUILD.bazel b/libraries/coil/BUILD.bazel index a06842e613c7..10f6d46bfd8c 100644 --- a/libraries/coil/BUILD.bazel +++ b/libraries/coil/BUILD.bazel @@ -19,7 +19,7 @@ jvm_library( "@lib//:libraries-coil-io-coil-kt-coil3-compose-jvm", ], runtime_deps = [ - "//libraries/ktor-client", + "//libraries/ktor/client", "//libraries/compose-foundation-desktop", "@lib//:libraries-coil-io-coil-kt-coil3-network-ktor3-jvm", "@lib//:libraries-coil-io-coil-kt-coil3-svg-jvm", diff --git a/libraries/io/intellij.libraries.kotlinx.io.iml b/libraries/io/intellij.libraries.kotlinx.io.iml index efb085ec7aa9..27cf23894938 100644 --- a/libraries/io/intellij.libraries.kotlinx.io.iml +++ b/libraries/io/intellij.libraries.kotlinx.io.iml @@ -1,6 +1,6 @@ - + diff --git a/libraries/ktor-client-cio/intellij.libraries.ktor.client.cio.iml b/libraries/ktor-client-cio/intellij.libraries.ktor.client.cio.iml deleted file mode 100644 index d5df4e39b490..000000000000 --- a/libraries/ktor-client-cio/intellij.libraries.ktor.client.cio.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - 9a86341588057a23d3ba4562fdc8afcef6facd071678a0c20b3b28a19ec35c88 - - - b04aede18e9c008168096dc53a3fc016177b61a5ec3024afbf8caca0cd5dbf42 - - - f67507a3e8bf52aa08d753682e6cdda0194e3abe750118b99c9336953e598be9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libraries/ktor-client-cio/BUILD.bazel b/libraries/ktor/client-cio/BUILD.bazel similarity index 62% rename from libraries/ktor-client-cio/BUILD.bazel rename to libraries/ktor/client-cio/BUILD.bazel index 26b20c368163..4f000e745e48 100644 --- a/libraries/ktor-client-cio/BUILD.bazel +++ b/libraries/ktor/client-cio/BUILD.bazel @@ -2,23 +2,25 @@ load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") resourcegroup( - name = "ktor-client-cio_resources", + name = "libraries-ktor-client-cio_resources", srcs = glob(["resources/**/*"]), strip_prefix = "resources" ) jvm_library( - name = "ktor-client-cio", + name = "libraries-ktor-client-cio", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - resources = [":ktor-client-cio_resources"], + resources = [":libraries-ktor-client-cio_resources"], exports = [ "@lib//:libraries-ktor-client-cio-ktor-client-cio-internal", - "//libraries/ktor-client", + "//libraries/ktor/client", + "//libraries/ktor/network-tls:libraries-ktor-network-tls", ], runtime_deps = [ "@lib//:libraries-ktor-client-cio-ktor-client-cio-internal", - "//libraries/ktor-client", + "//libraries/ktor/client", + "//libraries/ktor/network-tls:libraries-ktor-network-tls", ] ) ### auto-generated section `build intellij.libraries.ktor.client.cio` end \ No newline at end of file diff --git a/libraries/ktor/client-cio/intellij.libraries.ktor.client.cio.iml b/libraries/ktor/client-cio/intellij.libraries.ktor.client.cio.iml new file mode 100644 index 000000000000..d83a203acdde --- /dev/null +++ b/libraries/ktor/client-cio/intellij.libraries.ktor.client.cio.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + 9a86341588057a23d3ba4562fdc8afcef6facd071678a0c20b3b28a19ec35c88 + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/ktor-client-cio/resources/intellij.libraries.ktor.client.cio.xml b/libraries/ktor/client-cio/resources/intellij.libraries.ktor.client.cio.xml similarity index 78% rename from libraries/ktor-client-cio/resources/intellij.libraries.ktor.client.cio.xml rename to libraries/ktor/client-cio/resources/intellij.libraries.ktor.client.cio.xml index 729f74291ab0..33eb1a8ab371 100644 --- a/libraries/ktor-client-cio/resources/intellij.libraries.ktor.client.cio.xml +++ b/libraries/ktor/client-cio/resources/intellij.libraries.ktor.client.cio.xml @@ -2,5 +2,6 @@ + \ No newline at end of file diff --git a/libraries/ktor-client/BUILD.bazel b/libraries/ktor/client/BUILD.bazel similarity index 83% rename from libraries/ktor-client/BUILD.bazel rename to libraries/ktor/client/BUILD.bazel index 6b7f9ba6e1fc..f92b7f120deb 100644 --- a/libraries/ktor-client/BUILD.bazel +++ b/libraries/ktor/client/BUILD.bazel @@ -2,16 +2,16 @@ load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") resourcegroup( - name = "ktor-client_resources", + name = "client_resources", srcs = glob(["resources/**/*"]), strip_prefix = "resources" ) jvm_library( - name = "ktor-client", + name = "client", visibility = ["//visibility:public"], srcs = glob([], allow_empty = True), - resources = [":ktor-client_resources"], + resources = [":client_resources"], exports = [ "@lib//:ktor-client-core", "@lib//:ktor-client-java", @@ -21,6 +21,8 @@ jvm_library( "@lib//:kotlinx-serialization-json-io", "@lib//:ktor-client-auth", "@lib//:ktor-client-logging", + "//libraries/ktor/utils", + "//libraries/ktor/io", ], runtime_deps = [ "@lib//:ktor-client-core", @@ -31,7 +33,8 @@ jvm_library( "@lib//:kotlinx-serialization-json-io", "@lib//:ktor-client-auth", "@lib//:ktor-client-logging", - "//libraries/io", + "//libraries/ktor/utils", + "//libraries/ktor/io", ] ) ### auto-generated section `build intellij.libraries.ktor.client` end \ No newline at end of file diff --git a/libraries/ktor-client/intellij.libraries.ktor.client.iml b/libraries/ktor/client/intellij.libraries.ktor.client.iml similarity index 80% rename from libraries/ktor-client/intellij.libraries.ktor.client.iml rename to libraries/ktor/client/intellij.libraries.ktor.client.iml index c03c2c2e58ec..382ab32f13a0 100644 --- a/libraries/ktor-client/intellij.libraries.ktor.client.iml +++ b/libraries/ktor/client/intellij.libraries.ktor.client.iml @@ -1,6 +1,6 @@ - + @@ -15,6 +15,7 @@ - + + \ No newline at end of file diff --git a/libraries/ktor/client/resources/intellij.libraries.ktor.client.xml b/libraries/ktor/client/resources/intellij.libraries.ktor.client.xml new file mode 100644 index 000000000000..0a6cab3feefd --- /dev/null +++ b/libraries/ktor/client/resources/intellij.libraries.ktor.client.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/libraries/ktor/io/BUILD.bazel b/libraries/ktor/io/BUILD.bazel new file mode 100644 index 000000000000..a806739d310f --- /dev/null +++ b/libraries/ktor/io/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.ktor.io` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "io_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "io", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":io_resources"], + exports = ["@lib//:libraries-ktor-io-ktor-io"], + runtime_deps = ["@lib//:libraries-ktor-io-ktor-io"] +) +### auto-generated section `build intellij.libraries.ktor.io` end \ No newline at end of file diff --git a/libraries/ktor/io/intellij.libraries.ktor.io.iml b/libraries/ktor/io/intellij.libraries.ktor.io.iml new file mode 100644 index 000000000000..674b90e56def --- /dev/null +++ b/libraries/ktor/io/intellij.libraries.ktor.io.iml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + bb2fb6c00afaa34b539cb30e7584d37bfcba171c266bbdb9990e003579dc24c1 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/ktor/io/resources/intellij.libraries.ktor.io.xml b/libraries/ktor/io/resources/intellij.libraries.ktor.io.xml new file mode 100644 index 000000000000..50f274dc8825 --- /dev/null +++ b/libraries/ktor/io/resources/intellij.libraries.ktor.io.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/libraries/ktor/network-tls/BUILD.bazel b/libraries/ktor/network-tls/BUILD.bazel new file mode 100644 index 000000000000..d3c9428100eb --- /dev/null +++ b/libraries/ktor/network-tls/BUILD.bazel @@ -0,0 +1,21 @@ +### auto-generated section `build intellij.libraries.ktor.network.tls` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "libraries-ktor-network-tls_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "libraries-ktor-network-tls", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":libraries-ktor-network-tls_resources"], + exports = ["@lib//:ktor-network-tls"], + runtime_deps = [ + "@lib//:ktor-network-tls", + "//libraries/io", + ] +) +### auto-generated section `build intellij.libraries.ktor.network.tls` end \ No newline at end of file diff --git a/libraries/ktor/network-tls/intellij.libraries.ktor.network.tls.iml b/libraries/ktor/network-tls/intellij.libraries.ktor.network.tls.iml new file mode 100644 index 000000000000..66e73a1cad88 --- /dev/null +++ b/libraries/ktor/network-tls/intellij.libraries.ktor.network.tls.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/ktor-client/resources/intellij.libraries.ktor.client.xml b/libraries/ktor/network-tls/resources/intellij.libraries.ktor.network.tls.xml similarity index 100% rename from libraries/ktor-client/resources/intellij.libraries.ktor.client.xml rename to libraries/ktor/network-tls/resources/intellij.libraries.ktor.network.tls.xml diff --git a/libraries/ktor/utils/BUILD.bazel b/libraries/ktor/utils/BUILD.bazel new file mode 100644 index 000000000000..902ba5b013c0 --- /dev/null +++ b/libraries/ktor/utils/BUILD.bazel @@ -0,0 +1,18 @@ +### auto-generated section `build intellij.libraries.ktor.utils` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "resourcegroup") + +resourcegroup( + name = "utils_resources", + srcs = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "utils", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True), + resources = [":utils_resources"], + exports = ["@lib//:libraries-ktor-utils-ktor-utils"], + runtime_deps = ["@lib//:libraries-ktor-utils-ktor-utils"] +) +### auto-generated section `build intellij.libraries.ktor.utils` end \ No newline at end of file diff --git a/libraries/ktor/utils/intellij.libraries.ktor.utils.iml b/libraries/ktor/utils/intellij.libraries.ktor.utils.iml new file mode 100644 index 000000000000..35bcb13af6f6 --- /dev/null +++ b/libraries/ktor/utils/intellij.libraries.ktor.utils.iml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + 33333937b98fc0c8e943ee4b10b3ea66b49782dfb569c44c142da4f32d85dffc + + + 3565b6d4d789bf70683c45566944287fc1d8dc75c23d98bd87d01059cc76f2b3 + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/ktor/utils/resources/intellij.libraries.ktor.utils.xml b/libraries/ktor/utils/resources/intellij.libraries.ktor.utils.xml new file mode 100644 index 000000000000..a3947d450d7a --- /dev/null +++ b/libraries/ktor/utils/resources/intellij.libraries.ktor.utils.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/platform/build-scripts/downloader/BUILD.bazel b/platform/build-scripts/downloader/BUILD.bazel index 1006b32bbc68..3ece0825081d 100644 --- a/platform/build-scripts/downloader/BUILD.bazel +++ b/platform/build-scripts/downloader/BUILD.bazel @@ -14,17 +14,15 @@ jvm_library( "@lib//:zstd-jni", "@lib//:commons-io", "@lib//:kotlin-stdlib", - "@lib//:ktor-client-auth", - "@lib//:ktor-client-encoding", "@lib//:kotlinx-coroutines-core", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", "@lib//:opentelemetry-extension-kotlin", "@lib//:ktor-client-okhttp", "@lib//:okhttp", - "@lib//:ktor-client-core", "@lib//:hash4j", - ], - runtime_deps = ["@lib//:kotlinx-io-core"] + "//libraries/ktor/client", + "//libraries/ktor/io", + ] ) ### auto-generated section `build intellij.platform.buildScripts.downloader` end \ No newline at end of file diff --git a/platform/build-scripts/downloader/intellij.platform.buildScripts.downloader.iml b/platform/build-scripts/downloader/intellij.platform.buildScripts.downloader.iml index ad1e3cb28f9b..72a8d6ee9f2a 100644 --- a/platform/build-scripts/downloader/intellij.platform.buildScripts.downloader.iml +++ b/platform/build-scripts/downloader/intellij.platform.buildScripts.downloader.iml @@ -29,16 +29,14 @@ - - - - + + \ No newline at end of file diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt index 6b9be2ddddc7..c230d8b25d8c 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/impl/libraries/libraries.kt @@ -31,6 +31,9 @@ private val LIBRARY_MODULE_NAMES: Set = setOf( "intellij.libraries.kotlinTestAssertionsCoreJvm", "intellij.libraries.ktor.client", "intellij.libraries.ktor.client.cio", + "intellij.libraries.ktor.io", + "intellij.libraries.ktor.network.tls", + "intellij.libraries.ktor.utils", "intellij.libraries.kotlinx.io", "intellij.libraries.skiko", "intellij.libraries.coil", diff --git a/platform/jewel/markdown/extensions/images/BUILD.bazel b/platform/jewel/markdown/extensions/images/BUILD.bazel index f5c8b34db2fe..84f7f5f9bf55 100644 --- a/platform/jewel/markdown/extensions/images/BUILD.bazel +++ b/platform/jewel/markdown/extensions/images/BUILD.bazel @@ -35,7 +35,7 @@ jvm_library( "//platform/jewel/ui", "//platform/jewel/foundation", "//libraries/coil", - "//libraries/ktor-client", + "//libraries/ktor/client", "//libraries/compose-foundation-desktop", ], exports = ["//libraries/coil"], @@ -60,7 +60,7 @@ jvm_library( "//platform/jewel/foundation:foundation_test_lib", "//libraries/coil", "//libraries/compose-foundation-desktop-junit", - "//libraries/ktor-client", + "//libraries/ktor/client", "//libraries/compose-foundation-desktop", ], exports = ["//libraries/coil"], diff --git a/platform/platform-resources/src/META-INF/essential-libs.xml b/platform/platform-resources/src/META-INF/essential-libs.xml index 30411bbfe400..ee76cfbe7dc0 100644 --- a/platform/platform-resources/src/META-INF/essential-libs.xml +++ b/platform/platform-resources/src/META-INF/essential-libs.xml @@ -1,11 +1,9 @@ - + + - - - \ No newline at end of file diff --git a/platform/platform-resources/src/META-INF/essential-modules.xml b/platform/platform-resources/src/META-INF/essential-modules.xml index 311ce790a126..4e754e13b232 100644 --- a/platform/platform-resources/src/META-INF/essential-modules.xml +++ b/platform/platform-resources/src/META-INF/essential-modules.xml @@ -1,5 +1,6 @@ + diff --git a/platform/platform-resources/src/META-INF/ktor-libs.xml b/platform/platform-resources/src/META-INF/ktor-libs.xml new file mode 100644 index 000000000000..049e0c768182 --- /dev/null +++ b/platform/platform-resources/src/META-INF/ktor-libs.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/platform/util/http/BUILD.bazel b/platform/util/http/BUILD.bazel index 78f55572b0a8..b92353ad25e9 100644 --- a/platform/util/http/BUILD.bazel +++ b/platform/util/http/BUILD.bazel @@ -11,7 +11,7 @@ jvm_library( "@lib//:kotlin-stdlib", "@lib//:kotlinx-coroutines-core", "@lib//:jetbrains-annotations", - "//libraries/ktor-client", + "//libraries/ktor/client", "//libraries/io", ] ) diff --git a/platform/wsl-impl/BUILD.bazel b/platform/wsl-impl/BUILD.bazel index de898588c9df..b30d0d306372 100644 --- a/platform/wsl-impl/BUILD.bazel +++ b/platform/wsl-impl/BUILD.bazel @@ -15,8 +15,9 @@ jvm_library( "//platform/core-api:core", "@lib//:lz4-java", "//platform/util-ex", - "@lib//:ktor-network-tls", - "//libraries/io", + "//libraries/ktor/utils", + "//libraries/ktor/io", + "//libraries/ktor/network-tls:libraries-ktor-network-tls", ] ) ### auto-generated section `build intellij.platform.wsl.impl` end \ 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 7418c0a1708c..05f9fbca7eb3 100644 --- a/platform/wsl-impl/intellij.platform.wsl.impl.iml +++ b/platform/wsl-impl/intellij.platform.wsl.impl.iml @@ -15,7 +15,8 @@ - - + + + \ No newline at end of file diff --git a/plugins/evaluation-plugin/BUILD.bazel b/plugins/evaluation-plugin/BUILD.bazel index 4dd31598228d..7f7f174add49 100644 --- a/plugins/evaluation-plugin/BUILD.bazel +++ b/plugins/evaluation-plugin/BUILD.bazel @@ -19,7 +19,7 @@ jvm_library( "//plugins/evaluation-plugin/core", "//plugins/completion-ml-ranking", "//libraries/io", - "//libraries/ktor-client", + "//libraries/ktor/client", "//platform/analysis-api:analysis", "//platform/code-style-api:codeStyle", "//platform/util/concurrency", diff --git a/plugins/mcp-server/BUILD.bazel b/plugins/mcp-server/BUILD.bazel index 611342d094ad..9a7d6993d0c4 100644 --- a/plugins/mcp-server/BUILD.bazel +++ b/plugins/mcp-server/BUILD.bazel @@ -70,9 +70,11 @@ jvm_library( "//plugins/sh/core", "//platform/util/jdom", "//libraries/io", - "//libraries/ktor-client", - "//libraries/ktor-client-cio", + "//libraries/ktor/client", + "//libraries/ktor/client-cio:libraries-ktor-client-cio", + "//libraries/ktor/network-tls:libraries-ktor-network-tls", "@lib//:mcpserver-ktor-server-cio-internal", + "//libraries/ktor/io", ] ) @@ -151,9 +153,11 @@ jvm_library( "//plugins/sh/core", "//platform/util/jdom", "//libraries/io", - "//libraries/ktor-client", - "//libraries/ktor-client-cio", + "//libraries/ktor/client", + "//libraries/ktor/client-cio:libraries-ktor-client-cio", + "//libraries/ktor/network-tls:libraries-ktor-network-tls", "@lib//:mcpserver-ktor-server-cio-internal", + "//libraries/ktor/io", ] ) ### auto-generated section `build intellij.mcpserver` end diff --git a/plugins/mcp-server/intellij.mcpserver.iml b/plugins/mcp-server/intellij.mcpserver.iml index e1121c6b40c8..866718bb04b6 100644 --- a/plugins/mcp-server/intellij.mcpserver.iml +++ b/plugins/mcp-server/intellij.mcpserver.iml @@ -93,6 +93,7 @@ + @@ -138,5 +139,6 @@ + \ No newline at end of file diff --git a/plugins/mcp-server/mcpserver.stdio/BUILD.bazel b/plugins/mcp-server/mcpserver.stdio/BUILD.bazel index 4b7e6e9cff45..2ac855248ef8 100644 --- a/plugins/mcp-server/mcpserver.stdio/BUILD.bazel +++ b/plugins/mcp-server/mcpserver.stdio/BUILD.bazel @@ -17,7 +17,7 @@ jvm_library( "@lib//:io-modelcontextprotocol-kotlin-sdk", "@lib//:io-github-oshai-kotlin-logging-jvm", "//libraries/io", - "//libraries/ktor-client", + "//libraries/ktor/client", ], exports = [ "@lib//:kotlin-stdlib", diff --git a/plugins/mcp-server/resources/META-INF/plugin.xml b/plugins/mcp-server/resources/META-INF/plugin.xml index 3a48085e0f7f..9a5091d9e28c 100644 --- a/plugins/mcp-server/resources/META-INF/plugin.xml +++ b/plugins/mcp-server/resources/META-INF/plugin.xml @@ -22,6 +22,8 @@ + + diff --git a/plugins/repository-search/BUILD.bazel b/plugins/repository-search/BUILD.bazel index a82d264540c4..7c85261765f8 100644 --- a/plugins/repository-search/BUILD.bazel +++ b/plugins/repository-search/BUILD.bazel @@ -48,7 +48,7 @@ jvm_library( "//libraries/kotlinx/serialization/json", "@lib//:kotlinx-coroutines-slf4j", "//libraries/io", - "//libraries/ktor-client", + "//libraries/ktor/client", "@lib//:package-search-api-client", "@lib//:kotlinx-document-store-mvstore", "@lib//:mvstore", @@ -88,7 +88,7 @@ jvm_library( "@lib//:ktor-client-mock", "@lib//:kotlinx-coroutines-test", "//libraries/io", - "//libraries/ktor-client", + "//libraries/ktor/client", "@lib//:package-search-api-client", "@lib//:kotlinx-document-store-mvstore", "@lib//:mvstore", diff --git a/plugins/repository-search/src/main/resources/META-INF/plugin.xml b/plugins/repository-search/src/main/resources/META-INF/plugin.xml index b590875478a6..4be652e5a514 100644 --- a/plugins/repository-search/src/main/resources/META-INF/plugin.xml +++ b/plugins/repository-search/src/main/resources/META-INF/plugin.xml @@ -9,6 +9,7 @@ +