diff --git a/java/idea-ui/BUILD.bazel b/java/idea-ui/BUILD.bazel index 15b5b38e6418..7b3212b8abd4 100644 --- a/java/idea-ui/BUILD.bazel +++ b/java/idea-ui/BUILD.bazel @@ -95,6 +95,7 @@ jvm_library( "//platform/testFramework/junit5/eel", "//platform/testFramework/junit5/eel:eel_test_lib", "//platform/eel-provider", + "//libraries/io", ] ) diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index bda5bc9276f3..5a2e22f15193 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -4076,6 +4076,34 @@ jvm_import( visibility = ["//visibility:public"] ) +java_library( + name = "kotlinx-io-core", + exports = [ + ":kotlinx-io-core-jvm-0_6_0_http_import", + ":kotlinx-io-bytestring-jvm-0_6_0_http_import", + ], + visibility = ["//visibility:public"] +) + +jvm_import( + name = "kotlinx-io-core-jvm-0_6_0_http_import", + jar = "@kotlinx-io-core-jvm-0_6_0_http//file", + source_jar = "@kotlinx-io-core-jvm-0_6_0-sources_http//file" +) + +jvm_import( + name = "kotlinx-io-bytestring-jvm-0_6_0_http_import", + jar = "@kotlinx-io-bytestring-jvm-0_6_0_http//file", + source_jar = "@kotlinx-io-bytestring-jvm-0_6_0-sources_http//file" +) + +java_library( + name = "kotlinx-io-core-provided", + exports = [":kotlinx-io-core"], + neverlink = True, + visibility = ["//visibility:public"] +) + jvm_import( name = "kotlinx-serialization-core", jar = "@kotlinx-serialization-core-jvm-1_7_3_http//file", @@ -4134,8 +4162,6 @@ java_library( ":ktor-http-jvm-3_0_3_http_import", ":ktor-utils-jvm-3_0_3_http_import", ":ktor-io-jvm-3_0_3_http_import", - ":kotlinx-io-core-jvm-0_5_4_http_import", - ":kotlinx-io-bytestring-jvm-0_5_4_http_import", ":ktor-events-jvm-3_0_3_http_import", ":ktor-websocket-serialization-jvm-3_0_3_http_import", ":ktor-serialization-jvm-3_0_3_http_import", @@ -4169,18 +4195,6 @@ jvm_import( source_jar = "@ktor-io-jvm-3_0_3-sources_http//file" ) -jvm_import( - name = "kotlinx-io-core-jvm-0_5_4_http_import", - jar = "@kotlinx-io-core-jvm-0_5_4_http//file", - source_jar = "@kotlinx-io-core-jvm-0_5_4-sources_http//file" -) - -jvm_import( - name = "kotlinx-io-bytestring-jvm-0_5_4_http_import", - jar = "@kotlinx-io-bytestring-jvm-0_5_4_http//file", - source_jar = "@kotlinx-io-bytestring-jvm-0_5_4-sources_http//file" -) - jvm_import( name = "ktor-events-jvm-3_0_3_http_import", jar = "@ktor-events-jvm-3_0_3_http//file", @@ -4231,8 +4245,6 @@ java_library( ":ktor-http-cio-jvm-3_0_3_http_import", ":ktor-network-jvm-3_0_3_http_import", ":ktor-io-jvm-3_0_3_http_import", - ":kotlinx-io-core-jvm-0_5_4_http_import", - ":kotlinx-io-bytestring-jvm-0_5_4_http_import", ":ktor-websockets-jvm-3_0_3_http_import", ":ktor-network-tls-jvm-3_0_3_http_import", ":ktor-utils-jvm-3_0_3_http_import", @@ -4278,8 +4290,6 @@ java_library( ":ktor-http-jvm-3_0_3_http_import", ":ktor-utils-jvm-3_0_3_http_import", ":ktor-io-jvm-3_0_3_http_import", - ":kotlinx-io-core-jvm-0_5_4_http_import", - ":kotlinx-io-bytestring-jvm-0_5_4_http_import", ":ktor-events-jvm-3_0_3_http_import", ":ktor-websocket-serialization-jvm-3_0_3_http_import", ":ktor-serialization-jvm-3_0_3_http_import", @@ -4317,8 +4327,6 @@ java_library( ":ktor-http-jvm-3_0_3_http_import", ":ktor-utils-jvm-3_0_3_http_import", ":ktor-io-jvm-3_0_3_http_import", - ":kotlinx-io-core-jvm-0_5_4_http_import", - ":kotlinx-io-bytestring-jvm-0_5_4_http_import", ":ktor-client-core-jvm-3_0_3_http_import", ":ktor-events-jvm-3_0_3_http_import", ":ktor-websocket-serialization-jvm-3_0_3_http_import", @@ -4350,8 +4358,6 @@ java_library( ":ktor-network-jvm-3_0_3_http_import", ":ktor-utils-jvm-3_0_3_http_import", ":ktor-io-jvm-3_0_3_http_import", - ":kotlinx-io-core-jvm-0_5_4_http_import", - ":kotlinx-io-bytestring-jvm-0_5_4_http_import", ], visibility = ["//visibility:public"] ) @@ -4390,8 +4396,6 @@ java_library( ":ktor-events-jvm-3_0_3_http_import", ":ktor-http-cio-jvm-3_0_3_http_import", ":ktor-io-jvm-3_0_3_http_import", - ":kotlinx-io-core-jvm-0_5_4_http_import", - ":kotlinx-io-bytestring-jvm-0_5_4_http_import", ":ktor-websockets-jvm-3_0_3_http_import", ":ktor-network-jvm-3_0_3_http_import", ], @@ -8736,8 +8740,8 @@ java_library( jvm_import( name = "spellchecker-ai-grazie-spell-hunspell-en", - jar = "@hunspell-en-jvm-0_2_246_http//file", - source_jar = "@hunspell-en-jvm-0_2_246-sources_http//file", + jar = "@hunspell-en-jvm-0_2_274_http//file", + source_jar = "@hunspell-en-jvm-0_2_274-sources_http//file", visibility = ["//visibility:public"] ) diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 04994f2619c2..732350f0289a 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -5668,6 +5668,34 @@ http_file( downloaded_file_path = "kotlinx-html-jvm-0.12.0-sources.jar" ) +http_file( + name = "kotlinx-io-core-jvm-0_6_0_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.6.0/kotlinx-io-core-jvm-0.6.0.jar", + sha256 = "42523c80823d31ef59fae42c9252ef1d3b1189ca9d3cc3adfd402a29d063e6ff", + downloaded_file_path = "kotlinx-io-core-jvm-0.6.0.jar" +) + +http_file( + name = "kotlinx-io-bytestring-jvm-0_6_0_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.6.0/kotlinx-io-bytestring-jvm-0.6.0.jar", + sha256 = "baa77a783d70a66af88d6898a1d4971e4aa84e62b26418057379bdf09fb5bada", + downloaded_file_path = "kotlinx-io-bytestring-jvm-0.6.0.jar" +) + +http_file( + name = "kotlinx-io-core-jvm-0_6_0-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.6.0/kotlinx-io-core-jvm-0.6.0-sources.jar", + sha256 = "f10ed36857100403112ce45c9647252d95adc06fab2b0930e9b11e1af255fd86", + downloaded_file_path = "kotlinx-io-core-jvm-0.6.0-sources.jar" +) + +http_file( + name = "kotlinx-io-bytestring-jvm-0_6_0-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.6.0/kotlinx-io-bytestring-jvm-0.6.0-sources.jar", + sha256 = "e56a4af58013c739480fb1305224e9af2816b4c7add27db4adc291da7ea403c5", + downloaded_file_path = "kotlinx-io-bytestring-jvm-0.6.0-sources.jar" +) + http_file( name = "kotlinx-serialization-core-jvm-1_7_3_http", url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-serialization-core-jvm/1.7.3/kotlinx-serialization-core-jvm-1.7.3.jar", @@ -5759,20 +5787,6 @@ http_file( downloaded_file_path = "ktor-io-jvm-3.0.3.jar" ) -http_file( - name = "kotlinx-io-core-jvm-0_5_4_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4.jar", - sha256 = "dc3587c12795af01231591c0ef09a4139dfca8113c2989273b96b958006853c3", - downloaded_file_path = "kotlinx-io-core-jvm-0.5.4.jar" -) - -http_file( - name = "kotlinx-io-bytestring-jvm-0_5_4_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4.jar", - sha256 = "1fc96e19b445387dbc49183d0cc623c5a61bfa47c86cf81aaf5aff4845154fab", - downloaded_file_path = "kotlinx-io-bytestring-jvm-0.5.4.jar" -) - http_file( name = "ktor-events-jvm-3_0_3_http", url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3.jar", @@ -5829,20 +5843,6 @@ http_file( downloaded_file_path = "ktor-io-jvm-3.0.3-sources.jar" ) -http_file( - name = "kotlinx-io-core-jvm-0_5_4-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-io-core-jvm/0.5.4/kotlinx-io-core-jvm-0.5.4-sources.jar", - sha256 = "fa48baf82c3b07173f09004e7003239128a6a375bb08b71191d0b7d032e1e1d6", - downloaded_file_path = "kotlinx-io-core-jvm-0.5.4-sources.jar" -) - -http_file( - name = "kotlinx-io-bytestring-jvm-0_5_4-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-io-bytestring-jvm/0.5.4/kotlinx-io-bytestring-jvm-0.5.4-sources.jar", - sha256 = "4985c32e0d04ac8800f0e20bb1a95b261a7c6baa6921f20fca3bf1cb4d6006c5", - downloaded_file_path = "kotlinx-io-bytestring-jvm-0.5.4-sources.jar" -) - http_file( name = "ktor-events-jvm-3_0_3-sources_http", url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/ktor/ktor-events-jvm/3.0.3/ktor-events-jvm-3.0.3-sources.jar", @@ -12564,17 +12564,17 @@ http_file( ) http_file( - name = "hunspell-en-jvm-0_2_246_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/spell/hunspell-en-jvm/0.2.246/hunspell-en-jvm-0.2.246.jar", - sha256 = "b76f2c0952ed3b7cde6362e2104986572f05d5fa35840473973d81e41b842f4a", - downloaded_file_path = "hunspell-en-jvm-0.2.246.jar" + name = "hunspell-en-jvm-0_2_274_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/spell/hunspell-en-jvm/0.2.274/hunspell-en-jvm-0.2.274.jar", + sha256 = "89970bd551f4fb0bfbd70a4520fc934ebaa1d03aa4fda86ee20a7e2de48bc3e4", + downloaded_file_path = "hunspell-en-jvm-0.2.274.jar" ) http_file( - name = "hunspell-en-jvm-0_2_246-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/spell/hunspell-en-jvm/0.2.246/hunspell-en-jvm-0.2.246-sources.jar", - sha256 = "a828a43ae75d05f7cda7ad747d2d10ec806854617ba9f85430421a44b3d7eef2", - downloaded_file_path = "hunspell-en-jvm-0.2.246-sources.jar" + name = "hunspell-en-jvm-0_2_274-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/grazi/grazie-platform-public/ai/grazie/spell/hunspell-en-jvm/0.2.274/hunspell-en-jvm-0.2.274-sources.jar", + sha256 = "97f8f72bd7fe4dadc71ab5d4f21a8bd110d33157804bfea488151dc5df7497e9", + downloaded_file_path = "hunspell-en-jvm-0.2.274-sources.jar" ) http_file( diff --git a/libraries/io/BUILD.bazel b/libraries/io/BUILD.bazel new file mode 100644 index 000000000000..db2a604572a7 --- /dev/null +++ b/libraries/io/BUILD.bazel @@ -0,0 +1,20 @@ +### auto-generated section `build intellij.libraries.kotlinx.io` start +load("@rules_java//java:defs.bzl", "java_library") +load("@rules_jvm//:jvm.bzl", "jvm_resources") + +jvm_resources( + name = "io_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +java_library( + name = "io", + visibility = ["//visibility:public"], + exports = ["@lib//:kotlinx-io-core"], + runtime_deps = [ + ":io_resources", + "@lib//:kotlinx-io-core", + ] +) +### auto-generated section `build intellij.libraries.kotlinx.io` end \ No newline at end of file diff --git a/libraries/ktor-client/BUILD.bazel b/libraries/ktor-client/BUILD.bazel index 27f4dc7f6f69..edb7f2043eea 100644 --- a/libraries/ktor-client/BUILD.bazel +++ b/libraries/ktor-client/BUILD.bazel @@ -17,6 +17,7 @@ java_library( "@lib//:ktor-client-encoding", "@lib//:ktor-client-content-negotiation", "@lib//:ktor-serialization-kotlinx-json", + "@lib//:kotlinx-serialization-json-io", "@lib//:ktor-client-auth", ], runtime_deps = [ @@ -26,7 +27,9 @@ java_library( "@lib//:ktor-client-encoding", "@lib//:ktor-client-content-negotiation", "@lib//:ktor-serialization-kotlinx-json", + "@lib//:kotlinx-serialization-json-io", "@lib//:ktor-client-auth", + "//libraries/io", ] ) ### auto-generated section `build intellij.libraries.ktor.client` end \ No newline at end of file diff --git a/platform/build-scripts/BUILD.bazel b/platform/build-scripts/BUILD.bazel index 3a688b34afe0..6caba10a3262 100644 --- a/platform/build-scripts/BUILD.bazel +++ b/platform/build-scripts/BUILD.bazel @@ -84,6 +84,7 @@ jvm_library( "//platform/boot", "//platform/ijent/buildConstants", "@lib//:ktor-client-core", + "//libraries/io", "@lib//:netty", "@lib//:netty-tcnative-boringssl", "//platform/util/coroutines", diff --git a/platform/build-scripts/downloader/BUILD.bazel b/platform/build-scripts/downloader/BUILD.bazel index 7b1b9546129d..d30e2c6af7eb 100644 --- a/platform/build-scripts/downloader/BUILD.bazel +++ b/platform/build-scripts/downloader/BUILD.bazel @@ -23,6 +23,7 @@ jvm_library( "@lib//:okhttp", "@lib//:ktor-client-core", "@lib//:hash4j", - ] + ], + runtime_deps = ["@lib//:kotlinx-io-core"] ) ### auto-generated section `build intellij.platform.buildScripts.downloader` end \ No newline at end of file diff --git a/platform/platform-tests/BUILD.bazel b/platform/platform-tests/BUILD.bazel index 0c56324adf16..ccc668defe5d 100644 --- a/platform/platform-tests/BUILD.bazel +++ b/platform/platform-tests/BUILD.bazel @@ -130,6 +130,7 @@ jvm_library( "@lib//:kotlinx-collections-immutable", "//platform/buildData", "@lib//:ktor-server-cio", + "//libraries/io", "//platform/ui.jcef", "@lib//:rhino", "//platform/eel-impl", diff --git a/platform/platform-tests/durability/BUILD.bazel b/platform/platform-tests/durability/BUILD.bazel index 0dbcdff06fbb..883350bd9d40 100644 --- a/platform/platform-tests/durability/BUILD.bazel +++ b/platform/platform-tests/durability/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( deps = [ "//platform/util-ex", "@lib//:ktor-network-tls", + "//libraries/io", "//platform/platform-impl:ide-impl", "//platform/platform-impl:ide-impl_test_lib", "@lib//:kotlinx-serialization-core", diff --git a/platform/util/http/BUILD.bazel b/platform/util/http/BUILD.bazel index 67b8443e5511..ea79acad58b3 100644 --- a/platform/util/http/BUILD.bazel +++ b/platform/util/http/BUILD.bazel @@ -12,6 +12,7 @@ jvm_library( "@lib//:kotlinx-coroutines-core", "@lib//:jetbrains-annotations", "@lib//:ktor-client-core", + "//libraries/io", "@lib//:ktor-client-java", ] ) diff --git a/platform/wsl-impl/BUILD.bazel b/platform/wsl-impl/BUILD.bazel index 32b0e36b87fc..b6bf36cc86ff 100644 --- a/platform/wsl-impl/BUILD.bazel +++ b/platform/wsl-impl/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( "@lib//:lz4-java", "//platform/util-ex", "@lib//:ktor-network-tls", + "//libraries/io", ] ) ### auto-generated section `build intellij.platform.wsl.impl` end \ No newline at end of file diff --git a/plugins/evaluation-plugin/BUILD.bazel b/plugins/evaluation-plugin/BUILD.bazel index 5296b99b9866..56f6604c1625 100644 --- a/plugins/evaluation-plugin/BUILD.bazel +++ b/plugins/evaluation-plugin/BUILD.bazel @@ -17,6 +17,7 @@ jvm_library( "//plugins/evaluation-plugin/languages", "//plugins/evaluation-plugin/core", "//plugins/completion-ml-ranking", + "//libraries/io", "//libraries/ktor-client", "//platform/editor-ui-api:editor-ui", "//plugins/stats-collector", diff --git a/plugins/maven-model/BUILD.bazel b/plugins/maven-model/BUILD.bazel index 0696fad24861..e6a9cc38fb1b 100644 --- a/plugins/maven-model/BUILD.bazel +++ b/plugins/maven-model/BUILD.bazel @@ -7,6 +7,6 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob(["src/main/java/**/*.kt", "src/main/java/**/*.java"], allow_empty = True), kotlinc_opts = "@community//:k8", - deps = ["@lib//:jetbrains-annotations-java5"] + deps = ["@lib//:jetbrains-annotations"] ) ### auto-generated section `build intellij.maven.model` end \ No newline at end of file diff --git a/plugins/repository-search/BUILD.bazel b/plugins/repository-search/BUILD.bazel index 38905db3450a..61ec0df4a247 100644 --- a/plugins/repository-search/BUILD.bazel +++ b/plugins/repository-search/BUILD.bazel @@ -46,6 +46,7 @@ jvm_library( "@lib//:kotlinx-serialization-json", "@lib//:ktor-client-logging", "@lib//:kotlinx-coroutines-slf4j", + "//libraries/io", "//libraries/ktor-client", "@lib//:package-search-api-client", "@lib//:kotlinx-document-store-mvstore", @@ -85,6 +86,7 @@ jvm_library( "@lib//:kotlinx-coroutines-slf4j", "@lib//:ktor-client-mock", "@lib//:kotlinx-coroutines-test", + "//libraries/io", "//libraries/ktor-client", "@lib//:package-search-api-client", "@lib//:kotlinx-document-store-mvstore", diff --git a/python/BUILD.bazel b/python/BUILD.bazel index 386c17382568..d9002e5f5088 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -251,6 +251,7 @@ jvm_library( "//platform/util/coroutines", "//python/python-syntax:syntax", "//platform/ui.jcef", + "//libraries/io", "//libraries/ktor-client", "//libraries/ktor-client-cio", "//platform/util/progress",