Switch to OkHttp as http client on jvm (#928)

Closes #771
kordlib · Mar 20, 2024 · 7350a21 · 7350a21
1 parent 76c5474
commit 7350a21
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -18,7 +18,7 @@ kotlin {
         }
         jvmMain {
             dependencies {
-                api(libs.ktor.client.cio)
+                api(libs.ktor.client.okhttp)
             }
         }
         nonJvmMain {

diff --git a/common/src/jvmMain/kotlin/http/HttpEngine.kt b/common/src/jvmMain/kotlin/http/HttpEngine.kt
@@ -2,8 +2,8 @@ package dev.kord.common.http
 
 import dev.kord.common.annotation.KordInternal
 import io.ktor.client.engine.*
-import io.ktor.client.engine.cio.*
+import io.ktor.client.engine.okhttp.OkHttp
 
 /** @suppress */
 @KordInternal
-public actual fun httpEngine(): HttpClientEngineFactory<HttpClientEngineConfig> = CIO
+public actual fun httpEngine(): HttpClientEngineFactory<HttpClientEngineConfig> = OkHttp
diff --git a/gateway/README.md b/gateway/README.md
@@ -9,7 +9,7 @@ suspend fun main(args: Array<String>) {
     val token = args.firstOrNull() ?: error("token required")
 
     val gateway = DefaultGateway { // optional builder for custom configuration
-        client = HttpClient(CIO) {
+        client = HttpClient {
             install(WebSockets)
             install(JsonFeature)
         }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -43,7 +43,7 @@ ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negoti
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
 ktor-client-js = { module = "io.ktor:ktor-client-js", version.ref = "ktor" }
-ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
+ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
 ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktor" }
 ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
 ktor-network = { module = "io.ktor:ktor-network", version.ref = "ktor" }

diff --git a/voice/src/main/kotlin/gateway/DefaultVoiceGatewayBuilder.kt b/voice/src/main/kotlin/gateway/DefaultVoiceGatewayBuilder.kt
@@ -5,7 +5,7 @@ import dev.kord.common.entity.Snowflake
 import dev.kord.gateway.retry.LinearRetry
 import dev.kord.gateway.retry.Retry
 import io.ktor.client.*
-import io.ktor.client.engine.cio.*
+import io.ktor.client.engine.okhttp.OkHttp
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.plugins.websocket.*
 import io.ktor.serialization.kotlinx.json.*
@@ -23,7 +23,7 @@ public class DefaultVoiceGatewayBuilder(
     public var eventFlow: MutableSharedFlow<VoiceEvent> = MutableSharedFlow(extraBufferCapacity = Int.MAX_VALUE)
 
     public fun build(): DefaultVoiceGateway {
-        val client = client ?: HttpClient(CIO) {
+        val client = client ?: HttpClient(OkHttp) {
             install(WebSockets)
             install(ContentNegotiation) {
                 json()