Supports static linking for curl engine

buildSrc/build.gradle.kts

@@ -26,6 +26,7 @@ dependencies {
     val kotlin_version = libs.versions.kotlin.get()
     implementation(kotlin("gradle-plugin", kotlin_version))
     implementation(kotlin("serialization", kotlin_version))
+    implementation(kotlin("compiler-embeddable", kotlin_version))
 
     val ktlint_version = libs.versions.ktlint.get()
     implementation("org.jmailen.gradle:kotlinter-gradle:$ktlint_version")

buildSrc/src/main/kotlin/KotlinExtensions.kt

@@ -19,11 +19,11 @@ val Project.kotlinter: KotlinterExtension get() = the()
 fun KotlinMultiplatformExtension.createCInterop(
     name: String,
     cinteropTargets: List<String>,
-    block: DefaultCInteropSettings.() -> Unit
+    block: DefaultCInteropSettings.(String) -> Unit
 ) {
     cinteropTargets.mapNotNull { targets.findByName(it) }.filterIsInstance<KotlinNativeTarget>().forEach {
         val main by it.compilations
-        main.cinterops.create(name, block)
+        main.cinterops.create(name) { block(it.name) }
     }
 }
 

gradle/libs.versions.toml

@@ -1,9 +1,9 @@
 [versions]
-kotlin = "2.0.20"
+kotlin = "2.1.0-Beta1"
 kotlinx-html = "0.11.0"
 kotlinx-datetime = "0.6.1"
 kotlinx-io = "0.5.4"
-coroutines = "1.8.1"
+coroutines = "1.9.0-RC.2"
 atomicfu = "0.25.0"
 serialization = "1.7.3"
 ktlint = "3.15.0"

ktor-client/ktor-client-curl/build.gradle.kts

@@ -22,19 +22,9 @@ plugins {
 }
 
 kotlin {
-    createCInterop("libcurl", listOf("macosX64", "linuxX64", "mingwX64")) {
-        definitionFile = File(projectDir, "desktop/interop/libcurl.def")
-        includeDirs.headerFilterOnly(paths)
-    }
-
-    createCInterop("libcurl", listOf("macosArm64")) {
-        definitionFile = File(projectDir, "desktop/interop/libcurl_arm64.def")
-        includeDirs.headerFilterOnly(paths)
-    }
-
-    createCInterop("libcurl", listOf("linuxArm64")) {
-        definitionFile = File(projectDir, "desktop/interop/libcurl_linux_arm64.def")
-        includeDirs.headerFilterOnly(listOf("desktop/interop/linuxArm64/include/"))
+    createCInterop("libcurl", listOf("linuxX64", "linuxArm64", "macosX64", "macosArm64", "mingwX64")) { name ->
+        definitionFile = File(projectDir, "desktop/interop/$name/libcurl.def")
+        includeDirs.headerFilterOnly("desktop/interop/$name/include/")
     }
 
     sourceSets {