Use WinHttp engine instead of Curl in tests to avoid libcurl setup

joffrey-bion · Aug 9, 2023 · 6a8dab6 · 6a8dab6
1 parent 7318109
commit 6a8dab6
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 102 deletions.
diff --git a/autobahn-test-suite/build.gradle.kts b/autobahn-test-suite/build.gradle.kts
@@ -53,7 +53,7 @@ kotlin {
         val mingwX64Main by getting {
             dependsOn(nativeMain)
             dependencies {
-                implementation(libs.ktor.client.curl)
+                implementation(libs.ktor.client.winhttp)
             }
         }
     }

diff --git a/...64Main/kotlin/org/hildan/krossbow/websocket/test/autobahn/AutobahnReportsNativeMingw64.kt b/...64Main/kotlin/org/hildan/krossbow/websocket/test/autobahn/AutobahnReportsNativeMingw64.kt
@@ -1,6 +1,6 @@
 package org.hildan.krossbow.websocket.test.autobahn
 
 import io.ktor.client.engine.*
-import io.ktor.client.engine.curl.*
+import io.ktor.client.engine.winhttp.*
 
-actual fun ktorEngine(): HttpClientEngineFactory<*> = Curl
+actual fun ktorEngine(): HttpClientEngineFactory<*> = WinHttp
diff --git a/autobahn-tests/build.gradle.kts b/autobahn-tests/build.gradle.kts
@@ -38,8 +38,6 @@ kotlin {
         attributes.attribute(websocketEngineAttribute, "builtin-darwin")
     }
 
-    setupMingwLibcurlFor(targetName = "mingwX64Ktor", project)
-
     sourceSets {
         val commonTest by getting {
             dependencies {
@@ -115,7 +113,7 @@ kotlin {
         val mingwX64KtorTest by getting {
             dependencies {
                 implementation(projects.krossbowWebsocketKtor)
-                implementation(libs.ktor.client.curl)
+                implementation(libs.ktor.client.winhttp)
             }
         }
 

diff --git a/...autobahn/KtorCurlWebSocketAutobahnTest.kt → ...obahn/KtorWinHttpWebSocketAutobahnTest.kt b/...autobahn/KtorCurlWebSocketAutobahnTest.kt → ...obahn/KtorWinHttpWebSocketAutobahnTest.kt
@@ -1,13 +1,13 @@
 package org.hildan.krossbow.websocket.test.autobahn
 
 import io.ktor.client.*
-import io.ktor.client.engine.curl.*
+import io.ktor.client.engine.winhttp.*
 import io.ktor.client.plugins.websocket.*
 import org.hildan.krossbow.websocket.WebSocketClient
 import org.hildan.krossbow.websocket.ktor.KtorWebSocketClient
 
-class KtorCurlWebSocketAutobahnTest : AutobahnClientTestSuite(
-    agentUnderTest = "krossbow-ktor-curl-client-${Platform.osFamily.name.lowercase()}",
+class KtorWinHttpWebSocketAutobahnTest : AutobahnClientTestSuite(
+    agentUnderTest = "krossbow-ktor-winhttp-client-${Platform.osFamily.name.lowercase()}",
 ) {
-    override fun provideClient(): WebSocketClient = KtorWebSocketClient(HttpClient(Curl) { install(WebSockets) })
+    override fun provideClient(): WebSocketClient = KtorWebSocketClient(HttpClient(WinHttp) { install(WebSockets) })
 }
diff --git a/buildSrc/src/main/kotlin/LibcurlSetup.kt b/buildSrc/src/main/kotlin/LibcurlSetup.kt
diff --git a/cygwin-lib/libcurl.dll.a b/cygwin-lib/libcurl.dll.a
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -65,12 +65,12 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa
 ktor-client-contentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-client-curl = { module = "io.ktor:ktor-client-curl", version.ref = "ktor" }
 ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
 ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
 ktor-client-js = { module = "io.ktor:ktor-client-js", 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-winhttp = { module = "io.ktor:ktor-client-winhttp", version.ref = "ktor" }
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
 moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
 moshiKotlin = { module = "com.squareup.moshi:moshi-kotlin", version.ref = "moshi" }

diff --git a/krossbow-websocket-ktor/build.gradle.kts b/krossbow-websocket-ktor/build.gradle.kts
@@ -8,7 +8,6 @@ description = "Multiplatform implementation of Krossbow's WebSocket API using Kt
 
 kotlin {
     jsWithBigTimeouts()
-    setupMingwLibcurlFor(targetName = "mingwX64", project)
 
     sourceSets {
         val commonMain by getting {
@@ -39,7 +38,7 @@ kotlin {
         }
         val mingwX64Test by getting {
             dependencies {
-                implementation(libs.ktor.client.curl)
+                implementation(libs.ktor.client.winhttp)
             }
         }
         val darwinTest by getting {