KTOR-6754 provide targetName in createCInterop helper

ktorio · Feb 7, 2024 · c4e6c09 · c4e6c09
1 parent 4790920
commit c4e6c09
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/buildSrc/src/main/kotlin/KotlinExtensions.kt b/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) }
     }
 }
 

diff --git a/ktor-client/ktor-client-curl/build.gradle.kts b/ktor-client/ktor-client-curl/build.gradle.kts
@@ -24,17 +24,17 @@ plugins {
 kotlin {
     if (fastTarget()) return@kotlin
 
-    createCInterop("libcurl", listOf("macosX64", "linuxX64", "mingwX64")) {
+    createCInterop("libcurl", listOf("macosX64", "linuxX64", "mingwX64")) { _ ->
         defFile = File(projectDir, "desktop/interop/libcurl.def")
         includeDirs.headerFilterOnly(paths)
     }
 
-    createCInterop("libcurl", listOf("macosArm64")) {
+    createCInterop("libcurl", listOf("macosArm64")) { _ ->
         defFile = File(projectDir, "desktop/interop/libcurl_arm64.def")
         includeDirs.headerFilterOnly(paths)
     }
 
-    createCInterop("libcurl", listOf("linuxArm64")) {
+    createCInterop("libcurl", listOf("linuxArm64")) { _ ->
         defFile = File(projectDir, "desktop/interop/libcurl_linux_arm64.def")
         includeDirs.headerFilterOnly(listOf("desktop/interop/linuxArm64/include/"))
     }

diff --git a/ktor-client/ktor-client-winhttp/build.gradle.kts b/ktor-client/ktor-client-winhttp/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 kotlin {
     if (fastTarget()) return@kotlin
 
-    createCInterop("winhttp", windowsTargets()) {
+    createCInterop("winhttp", windowsTargets()) { _ ->
         defFile = File(projectDir, "windows/interop/winhttp.def")
     }
 

diff --git a/ktor-io/build.gradle.kts b/ktor-io/build.gradle.kts
@@ -1,5 +1,5 @@
 kotlin {
-    createCInterop("mutex", posixTargets()) {
+    createCInterop("mutex", posixTargets()) { _ ->
         defFile = File(projectDir, "posix/interop/mutex.def")
     }
 

diff --git a/ktor-network/build.gradle.kts b/ktor-network/build.gradle.kts
@@ -1,7 +1,7 @@
 description = "Ktor network utilities"
 
 kotlin {
-    createCInterop("network", nixTargets()) {
+    createCInterop("network", nixTargets()) { _ ->
         defFile = projectDir.resolve("nix/interop/network.def")
     }
 

diff --git a/ktor-server/ktor-server-core/build.gradle.kts b/ktor-server/ktor-server-core/build.gradle.kts
@@ -5,7 +5,7 @@
 description = ""
 
 kotlin {
-    createCInterop("host_common", nixTargets()) {
+    createCInterop("host_common", nixTargets()) { _ ->
         defFile = projectDir.resolve("nix/interop/host_common.def")
     }
 

diff --git a/ktor-server/ktor-server-plugins/ktor-server-default-headers/build.gradle.kts b/ktor-server/ktor-server-plugins/ktor-server-default-headers/build.gradle.kts
@@ -13,7 +13,7 @@ kotlin {
         }
     }
 
-    createCInterop("utils", nixTargets()) {
+    createCInterop("utils", nixTargets()) { _ ->
         defFile = File(projectDir, "nix/interop/utils.def")
     }
 }

diff --git a/ktor-utils/build.gradle.kts b/ktor-utils/build.gradle.kts
@@ -1,5 +1,5 @@
 kotlin {
-    createCInterop("threadUtils", nixTargets()) {
+    createCInterop("threadUtils", nixTargets()) { _ ->
         defFile = File(projectDir, "nix/interop/threadUtils.def")
     }