Skip to content

Commit 2922f78

Browse files
committed
chore: revert back the cio changes
1 parent fd33bc0 commit 2922f78

File tree

4 files changed

+32
-42
lines changed

4 files changed

+32
-42
lines changed

gradle/build-logic/src/main/kotlin/common/Multiplatform.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ fun KotlinMultiplatformExtension.jsTarget(project: Project) =
190190
sourceSets {
191191
jsMain {
192192
dependencies {
193+
api(libs.ktor.client.js)
193194
api(libs.kotlin.wrappers.browser)
194195
api(libs.kotlin.wrappers.css)
195196
// api(npm("@js-joda/timezone", libs.versions.npm.jsjoda.tz.get()))
@@ -245,6 +246,7 @@ fun KotlinMultiplatformExtension.wasmJsTarget(project: Project) =
245246
sourceSets {
246247
wasmJsMain {
247248
dependencies {
249+
api(libs.ktor.client.js)
248250
// kotlinx-browser is only supported for WasmJs.
249251
api(libs.kotlinx.browser)
250252
// api(npm("@js-joda/timezone", libs.versions.npm.jsjoda.tz.get()))

gradle/libs.versions.toml

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ org-name = "suresh.dev"
2020
org-url = "https://suresh.dev"
2121

2222
# Gradle Dependencies Versions
23-
bc-plugins = "1.8.0"
23+
bc-plugins = "1.9.0"
2424
kotlinx-kover = "0.9.1"
2525
kotlinx-bcv = "0.17.0"
2626
kotlin-dokka = "2.0.0"
@@ -30,20 +30,20 @@ kotlinx-coroutines = "1.10.1"
3030
kotlinx-datetime = "0.6.2"
3131
kotlinx-datetime-zoneinfo = "2025a-spi.0.6.2"
3232
kotlinx-serialization = "1.8.0"
33-
kotlinx-rpc = "0.5.0"
33+
kotlinx-rpc = "0.5.1"
3434
kotlinx-collections-immutable = "0.3.8"
3535
kotlinx-lincheck = "2.35"
3636
kotlinx-html = "0.12.0"
3737
kotlinx-browser = "0.3"
3838
kotlinx-benchmark = "0.4.13"
3939
kotlinx-metadata = "0.9.0"
4040
kotlinx-reflect-lite = "1.1.0"
41-
kotlin-wrappers = "2025.2.4"
41+
kotlin-wrappers = "2025.2.5"
4242
kotlin-redacted = "1.12.0"
4343
kotlin-serviceloader = "0.0.15"
4444
kotlinx-multik = "0.2.3"
45-
kotlinx-dataframe = "0.16.0-dev-5599"
46-
kotlinx-kandy = "0.8.0-dev-59"
45+
kotlinx-dataframe = "0.16.0-dev-5705"
46+
kotlinx-kandy = "0.8.0"
4747
kotlin-statistics = "0.4.0-RC1"
4848
evas = "1.2.0"
4949
kopy = "0.14.0+2.1.10"
@@ -174,18 +174,18 @@ langchain4j = "1.0.0-beta1"
174174
jlama = "0.8.4"
175175
mcp-kotlin = "0.3.0"
176176
mcp4k = "0.3.4"
177-
dflib = "2.0.0-M1"
177+
dflib = "2.0.0-M2"
178178
ldaptive = "2.4.0"
179179
chicory = "1.0.0"
180180
log4k = "0.30.0"
181181
rwmutex = "1.0.0"
182182
bluesky-ozone = "0.3.1"
183183

184184
# Compose
185-
jetbrains-compose = "1.8.0-alpha02"
186-
jetbrains-compose-viewmodel = "2.9.0-alpha02"
187-
jetbrains-compose-nav = "2.8.0-alpha12"
188-
jetbrains-compose-adaptive = "1.1.0-alpha02"
185+
jetbrains-compose = "1.8.0-alpha03"
186+
jetbrains-compose-viewmodel = "2.9.0-alpha03"
187+
jetbrains-compose-nav = "2.8.0-alpha13"
188+
jetbrains-compose-adaptive = "1.1.0-alpha03"
189189
kobweb = "0.20.3"
190190
detekt = "1.23.7"
191191
detekt-compose-rules = "0.4.22"
@@ -267,6 +267,7 @@ build-kmp-hierarchy = { module = "io.github.terrakok:kmp-hierar
267267
build-benmanesversions = { module = "com.github.ben-manes:gradle-versions-plugin" , version.ref = "benmanes"}
268268
build-gradle-develocity = { module = "com.gradle:develocity-gradle-plugin" , version.ref = "gradle-develocity" }
269269
build-mrjar-plugin = { module = "me.champeau.gradle.mrjar:plugin" , version.ref = "mrjar"}
270+
build-ktor-plugin = { module = "io.ktor.plugin:io.ktor.plugin.gradle.plugin" , version.ref = "ktor"}
270271
build-jte-plugin = { module = "gg.jte:jte-gradle-plugin" , version.ref = "jte"}
271272
build-nmcp-plugin = { module = "com.gradleup.nmcp:nmcp" , version.ref = "nmcp"}
272273
build-nexus-plugin = { module = "io.github.gradle-nexus:publish-plugin" , version.ref = "nexus-publish"}
@@ -345,6 +346,8 @@ kotlinx-dataframe-csv = { module = "org.jetbrains.kotlinx:datafra
345346
kotlinx-dataframe-geo = { module = "org.jetbrains.kotlinx:dataframe-geo" , version.ref = "kotlinx-dataframe"}
346347
kotlinx-dataframe-jdbc = { module = "org.jetbrains.kotlinx:dataframe-jdbc" , version.ref = "kotlinx-dataframe"}
347348
kotlinx-kandy = { module = "org.jetbrains.kotlinx:kandy-lets-plot" , version.ref = "kotlinx-kandy"}
349+
kotlinx-kandy-geo = { module = "org.jetbrains.kotlinx:kandy-geo" , version.ref = "kotlinx-kandy"}
350+
kotlinx-kandy-echarts = { module = "org.jetbrains.kotlinx:kandy-echarts" , version.ref = "kotlinx-kandy"}
348351
kotlin-statistics = { module = "org.jetbrains.kotlinx:kotlin-statistics" , version.ref = "kotlin-statistics"}
349352
kotlin-ksp-api = { module = "com.google.devtools.ksp:symbol-processing-api" , version.ref = "kotlin-ksp"}
350353
kotlin-redacted-annotations = { module = "dev.zacsweers.redacted:redacted-compiler-plugin-annotations" , version.ref = "kotlin-redacted"}
@@ -679,14 +682,25 @@ ajalt = ["ajalt-colormath",
679682
"ajalt-clikt",
680683
"ajalt-clikt-markdown"]
681684

682-
json-extra = ["kotlinx-jsonpath", "json-schema-validator"]
683-
keystore = ["sslcontext-kickstart", "directory-keystore"]
685+
dataviz = ["kotlinx-dataframe-csv",
686+
"kotlinx-dataframe-jdbc",
687+
"kotlinx-dataframe-geo",
688+
"kotlinx-kandy",
689+
"kotlinx-kandy-geo"]
690+
691+
json-extra = ["kotlinx-jsonpath",
692+
"json-schema-validator"]
693+
694+
keystore = ["sslcontext-kickstart",
695+
"directory-keystore"]
696+
684697
otel = ["otel-instr-annotations",
685698
"otel-autoconfigure",
686699
"otel-semconv",
687700
"otel-instr-ktor",
688701
"otel-instr-logback-mdc",
689702
"otel-instr-logback-appender"]
703+
690704
otel-agent-extn = ["otel-autoconfigure-spi",
691705
"otel-instr-api",
692706
"otel-instr-extension-api",

shared/src/jsMain/kotlin/dev/suresh/http/HttpClient.js.kt

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,12 @@ package dev.suresh.http
22

33
import io.github.oshai.kotlinlogging.KLogger
44
import io.ktor.client.*
5-
import io.ktor.client.engine.cio.*
5+
import io.ktor.client.engine.js.*
66

77
actual fun httpClient(
88
name: String,
99
timeout: Timeout,
1010
retry: Retry,
1111
httpLogger: KLogger,
1212
config: HttpClientConfig<*>.() -> Unit
13-
) =
14-
HttpClient(CIO) {
15-
config(this)
16-
engine {
17-
maxConnectionsCount = 1000
18-
endpoint {
19-
maxConnectionsPerRoute = 100
20-
pipelineMaxSize = 20
21-
keepAliveTime = 5000
22-
connectTimeout = 5000
23-
connectAttempts = 5
24-
}
25-
}
26-
}
13+
) = HttpClient(Js) { config(this) }

shared/src/wasmJsMain/kotlin/dev/suresh/http/HttpClient.wasmJs.kt

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,12 @@ package dev.suresh.http
22

33
import io.github.oshai.kotlinlogging.KLogger
44
import io.ktor.client.*
5-
import io.ktor.client.engine.cio.*
5+
import io.ktor.client.engine.js.*
66

77
actual fun httpClient(
88
name: String,
99
timeout: Timeout,
1010
retry: Retry,
1111
httpLogger: KLogger,
1212
config: HttpClientConfig<*>.() -> Unit,
13-
) =
14-
HttpClient(CIO) {
15-
config(this)
16-
engine {
17-
maxConnectionsCount = 1000
18-
endpoint {
19-
maxConnectionsPerRoute = 100
20-
pipelineMaxSize = 20
21-
keepAliveTime = 5000
22-
connectTimeout = 5000
23-
connectAttempts = 5
24-
}
25-
}
26-
}
13+
) = HttpClient(Js) { config(this) }

0 commit comments

Comments
 (0)