From 2999cdd3e0985417f2afd2c613b2b9c1ba22c4f5 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Wed, 6 Mar 2019 21:02:53 +0300 Subject: [PATCH] Avoid resolution ambiguity for cinterop DSL Earlier we used to have two methods: cinterops(Container.() -> Unit) and cinterops(Action). It's OK for Groovy DSL but causes resolution ambiguity in Kotlin DSL. This patch removes the first overload to avoid this situation. The second overload still can be called in Kotlin DSL as `cinterops { ... }`. --- .../kotlin/gradle/targets/native/KotlinNativeCompilation.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt index 579cb199af0..c0636f4b457 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeCompilation.kt @@ -181,7 +181,6 @@ class KotlinNativeCompilation( linkerOptsNoWarn = value } - fun cinterops(action: NamedDomainObjectContainer.() -> Unit) = cinterops.action() fun cinterops(action: Closure) = cinterops(ConfigureUtil.configureUsing(action)) fun cinterops(action: Action>) = action.execute(cinterops)