KTOR-6754 bump libcurl 8.6.0

ktorio · Feb 24, 2024 · 8caa37d · 8caa37d
1 parent b649099
commit 8caa37d
Show file tree

Hide file tree

Showing 1,070 changed files with 360,742 additions and 568 deletions.
diff --git a/ktor-client/ktor-client-curl/build.gradle.kts b/ktor-client/ktor-client-curl/build.gradle.kts
@@ -24,19 +24,9 @@ plugins {
 kotlin {
     if (fastTarget()) return@kotlin
 
-    createCInterop("libcurl", listOf("macosX64", "linuxX64", "mingwX64")) { _ ->
-        defFile = File(projectDir, "desktop/interop/libcurl.def")
-        includeDirs.headerFilterOnly(paths)
-    }
-
-    createCInterop("libcurl", listOf("macosArm64")) { _ ->
-        defFile = File(projectDir, "desktop/interop/libcurl_arm64.def")
-        includeDirs.headerFilterOnly(paths)
-    }
-
-    createCInterop("libcurl", listOf("linuxArm64")) { _ ->
-        defFile = File(projectDir, "desktop/interop/libcurl_linux_arm64.def")
-        includeDirs.headerFilterOnly(listOf("desktop/interop/linuxArm64/include/"))
+    createCInterop("libcurl", listOf("linuxX64", "linuxArm64", "macosX64", "macosArm64", "mingwX64")) { name ->
+        defFile = File(projectDir, "desktop/interop/$name/libcurl.def")
+        includeDirs.headerFilterOnly("desktop/interop/$name/include/")
     }
 
     sourceSets {

diff --git a/ktor-client/ktor-client-curl/desktop/interop/libcurl.def b/ktor-client/ktor-client-curl/desktop/interop/libcurl.def
diff --git a/ktor-client/ktor-client-curl/desktop/interop/libcurl_arm64.def b/ktor-client/ktor-client-curl/desktop/interop/libcurl_arm64.def
diff --git a/ktor-client/ktor-client-curl/desktop/interop/libcurl_linux_arm64.def b/ktor-client/ktor-client-curl/desktop/interop/libcurl_linux_arm64.def