diff --git a/.idea/modules.xml b/.idea/modules.xml index f8661d80c823..7b3a07bc30cb 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -8,6 +8,7 @@ + diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt index 7e127c5f04b0..80c8f1df6e2b 100644 --- a/build/bazel-generated-file-list.txt +++ b/build/bazel-generated-file-list.txt @@ -225,6 +225,7 @@ fleet/compiler-plugins fleet/fastutil fleet/junit4 fleet/kernel +fleet/ktor/client/cio fleet/ktor/client/core fleet/ktor/network/tls fleet/lsp.protocol diff --git a/fleet/ktor/client/cio/BUILD.bazel b/fleet/ktor/client/cio/BUILD.bazel new file mode 100644 index 000000000000..9b882466ccae --- /dev/null +++ b/fleet/ktor/client/cio/BUILD.bazel @@ -0,0 +1,46 @@ +### auto-generated section `build fleet.ktor.client.cio` start +load("@rules_jvm//:jvm.bzl", "jvm_library") + +jvm_library( + name = "cio", + visibility = ["//visibility:public"], + srcs = glob([], allow_empty = True, exclude = ["**/module-info.java"]), + exports = [ + "@lib//:fleet-io-ktor-client-cio", + "@lib//:fleet-io-ktor-client-core", + "@lib//:fleet-io-ktor-events", + "@lib//:fleet-io-ktor-http", + "@lib//:fleet-io-ktor-http-cio", + "@lib//:fleet-io-ktor-io", + "@lib//:fleet-io-ktor-network", + "@lib//:fleet-io-ktor-network-tls", + "@lib//:fleet-io-ktor-serialization", + "@lib//:fleet-io-ktor-sse", + "@lib//:fleet-io-ktor-utils", + "@lib//:fleet-io-ktor-websocket-serialization", + "@lib//:fleet-io-ktor-websockets", + ], + runtime_deps = [ + "@lib//:fleet-io-ktor-client-cio", + "@lib//:fleet-io-ktor-client-core", + "@lib//:fleet-io-ktor-events", + "@lib//:fleet-io-ktor-http", + "@lib//:fleet-io-ktor-http-cio", + "@lib//:fleet-io-ktor-io", + "@lib//:fleet-io-ktor-network", + "@lib//:fleet-io-ktor-network-tls", + "@lib//:fleet-io-ktor-serialization", + "@lib//:fleet-io-ktor-sse", + "@lib//:fleet-io-ktor-utils", + "@lib//:fleet-io-ktor-websocket-serialization", + "@lib//:fleet-io-ktor-websockets", + "@lib//:jetbrains-annotations", + "@lib//:kotlin-stdlib", + "@lib//:kotlinx-coroutines-core", + "@lib//:kotlinx-coroutines-slf4j", + "@lib//:kotlinx-io-core", + "@lib//:kotlinx-serialization-core", + "@lib//:slf4j-api", + ] +) +### auto-generated section `build fleet.ktor.client.cio` end \ No newline at end of file diff --git a/fleet/ktor/client/cio/fleet.ktor.client.cio.iml b/fleet/ktor/client/cio/fleet.ktor.client.cio.iml new file mode 100644 index 000000000000..02006f8374d7 --- /dev/null +++ b/fleet/ktor/client/cio/fleet.ktor.client.cio.iml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fleet/ktor/client/cio/gradlebuild/build.gradle.kts b/fleet/ktor/client/cio/gradlebuild/build.gradle.kts new file mode 100644 index 000000000000..78276bf8c0b8 --- /dev/null +++ b/fleet/ktor/client/cio/gradlebuild/build.gradle.kts @@ -0,0 +1,107 @@ +// IMPORT__MARKER_START +import fleet.buildtool.conventions.configureAtMostOneJvmTargetOrThrow +import fleet.buildtool.conventions.withJavaSourceSet +// IMPORT__MARKER_END +plugins { + alias(libs.plugins.kotlin.multiplatform) + id("fleet.project-module-conventions") + id("fleet.toolchain-conventions") + alias(libs.plugins.dokka) + // GRADLE_PLUGINS__MARKER_START + id("fleet-module") + // GRADLE_PLUGINS__MARKER_END +} + +fleetModule { + module { + name = "fleet.ktor.client.cio" + importedFromJps {} + } +} + +@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class) +kotlin { + // KOTLIN__MARKER_START + jvm {} + wasmJs { + browser {} + } + sourceSets.commonMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcCommonMain")) } + sourceSets.commonMain.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesCommonMain")) } + sourceSets.commonTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcCommonTest")) } + sourceSets.commonTest.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesCommonTest")) } + sourceSets.jvmMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcJvmMain")) } + configureAtMostOneJvmTargetOrThrow { compilations.named("main") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.projectDirectory.dir("../srcJvmMain")) } } } + sourceSets.jvmMain.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesJvmMain")) } + sourceSets.jvmTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcJvmTest")) } + configureAtMostOneJvmTargetOrThrow { compilations.named("test") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.projectDirectory.dir("../srcJvmTest")) } } } + sourceSets.jvmTest.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesJvmTest")) } + sourceSets.wasmJsMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcWasmJsMain")) } + sourceSets.wasmJsMain.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesWasmJsMain")) } + sourceSets.wasmJsTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcWasmJsTest")) } + sourceSets.wasmJsTest.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesWasmJsTest")) } + sourceSets.commonMain.dependencies { + api(jps.io.ktor.ktor.client.core.jvm53990062.get().let { "${it.group}:ktor-client-core:${it.version}" }) { + isTransitive = false + } + api(jps.io.ktor.ktor.events.jvm275570476.get().let { "${it.group}:ktor-events:${it.version}" }) { + isTransitive = false + } + api(jps.io.ktor.ktor.http.jvm1981380989.get().let { "${it.group}:ktor-http:${it.version}" }) { + isTransitive = false + } + api(jps.io.ktor.ktor.http.cio.jvm102837887.get().let { "${it.group}:ktor-http-cio:${it.version}" }) { + isTransitive = false + } + api(jps.io.ktor.ktor.io.jvm1043854879.get().let { "${it.group}:ktor-io:${it.version}" }) { + isTransitive = false + } + api(jps.io.ktor.ktor.serialization.jvm447701117.get().let { "${it.group}:ktor-serialization:${it.version}" }) { + isTransitive = false + } + api(jps.io.ktor.ktor.sse.jvm1845222574.get().let { "${it.group}:ktor-sse:${it.version}" }) { + isTransitive = false + } + api(jps.io.ktor.ktor.utils.jvm244677186.get().let { "${it.group}:ktor-utils:${it.version}" }) { + isTransitive = false + } + api(jps.io.ktor.ktor.websocket.serialization.jvm1254325065.get().let { "${it.group}:ktor-websocket-serialization:${it.version}" }) { + isTransitive = false + } + api(jps.io.ktor.ktor.websockets.jvm1404411833.get().let { "${it.group}:ktor-websockets:${it.version}" }) { + isTransitive = false + } + implementation(jps.org.jetbrains.annotations1504825916.get()) + implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) { + exclude(group = "org.jetbrains", module = "annotations") + } + implementation(jps.com.intellij.platform.kotlinx.coroutines.core.jvm134738847.get().let { "${it.group}:kotlinx-coroutines-core:${it.version}" }) { + isTransitive = false + } + implementation(jps.org.jetbrains.kotlinx.kotlinx.io.core.jvm479158162.get().let { "${it.group}:kotlinx-io-core:${it.version}" }) { + exclude(group = "org.jetbrains.kotlin", module = "kotlin-stdlib") + } + implementation(jps.org.jetbrains.kotlinx.kotlinx.serialization.core.jvm1739247612.get().let { "${it.group}:kotlinx-serialization-core:${it.version}" }) { + isTransitive = false + } + implementation(jps.org.slf4j.slf4j.api2013636515.get().let { "${it.group}:${it.name}:${it.version}" }) { + isTransitive = false + exclude(group = "org.slf4j", module = "slf4j-jdk14") + } + } + sourceSets.jvmMain.dependencies { + api(jps.io.ktor.ktor.client.cio.jvm590055166.get().let { "${it.group}:${it.name}:${it.version}" }) { + isTransitive = false + } + api(jps.io.ktor.ktor.network.jvm1442946683.get().let { "${it.group}:${it.name}:${it.version}" }) { + isTransitive = false + } + api(jps.io.ktor.ktor.network.tls.jvm656433577.get().let { "${it.group}:${it.name}:${it.version}" }) { + isTransitive = false + } + implementation(jps.com.intellij.platform.kotlinx.coroutines.slf4j1899700727.get().let { "${it.group}:${it.name}:${it.version}" }) { + isTransitive = false + } + } + // KOTLIN__MARKER_END +} \ No newline at end of file diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 11ae0235d829..d8bb3211db31 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -1493,6 +1493,13 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "fleet-io-ktor-client-cio", + 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 = "fleet-io-ktor-client-core", jar = "@io_ktor-ktor-client-core-jvm-3_1_3_http//file", diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 78571d9ebcf8..108783466d6a 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -1840,6 +1840,20 @@ http_file( downloaded_file_path = "file-prediction-model-0.3.0-sources.jar" ) +http_file( + name = "io_ktor-ktor-client-cio-jvm-3_1_3_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/ktor/ktor-client-cio-jvm/3.1.3/ktor-client-cio-jvm-3.1.3.jar", + sha256 = "9a86341588057a23d3ba4562fdc8afcef6facd071678a0c20b3b28a19ec35c88", + downloaded_file_path = "ktor-client-cio-jvm-3.1.3.jar" +) + +http_file( + name = "io_ktor-ktor-client-cio-jvm-3_1_3-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/ktor/ktor-client-cio-jvm/3.1.3/ktor-client-cio-jvm-3.1.3-sources.jar", + sha256 = "05d09d79cd1902de9ddffd3e430363ad7ffd7017c0a62a0ec4f56974f85f2844", + downloaded_file_path = "ktor-client-cio-jvm-3.1.3-sources.jar" +) + http_file( name = "io_ktor-ktor-client-core-jvm-3_1_3_http", url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/ktor/ktor-client-core-jvm/3.1.3/ktor-client-core-jvm-3.1.3.jar", @@ -5893,20 +5907,6 @@ http_file( downloaded_file_path = "ktor-client-auth-jvm-3.1.3-sources.jar" ) -http_file( - name = "io_ktor-ktor-client-cio-jvm-3_1_3_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/ktor/ktor-client-cio-jvm/3.1.3/ktor-client-cio-jvm-3.1.3.jar", - sha256 = "9a86341588057a23d3ba4562fdc8afcef6facd071678a0c20b3b28a19ec35c88", - downloaded_file_path = "ktor-client-cio-jvm-3.1.3.jar" -) - -http_file( - name = "io_ktor-ktor-client-cio-jvm-3_1_3-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/ktor/ktor-client-cio-jvm/3.1.3/ktor-client-cio-jvm-3.1.3-sources.jar", - sha256 = "05d09d79cd1902de9ddffd3e430363ad7ffd7017c0a62a0ec4f56974f85f2844", - downloaded_file_path = "ktor-client-cio-jvm-3.1.3-sources.jar" -) - http_file( name = "io_ktor-ktor-client-content-negotiation-jvm-3_1_3_http", url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/io/ktor/ktor-client-content-negotiation-jvm/3.1.3/ktor-client-content-negotiation-jvm-3.1.3.jar",