From 62134a0573b8ffaed5eb0c2f559055292460890a Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Fri, 26 May 2017 13:15:06 +0700 Subject: [PATCH] gradle-plugin: Fix interop artifact path --- .../src/main/kotlin/KonanCompilerConfig.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanCompilerConfig.kt b/tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanCompilerConfig.kt index a547a832d0c..006fa34ac81 100644 --- a/tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanCompilerConfig.kt +++ b/tools/kotlin-native-gradle-plugin/src/main/kotlin/KonanCompilerConfig.kt @@ -91,7 +91,7 @@ open class KonanCompilerConfig( anotherTask.target?.let { target(it) } anotherTask.languageVersion?.let { languageVersion(it) } anotherTask.apiVersion?.let { apiVersion(it) } - anotherTask.produce?.let { produce(it) } + anotherTask.produce.let { produce(it) } if (anotherTask.noStdLib) noStdLib() if (anotherTask.noMain) noMain() @@ -107,10 +107,7 @@ open class KonanCompilerConfig( compilationTask.dependsOn(generateStubsTask) linkerOpts(generateStubsTask.linkerOpts) - libraries(project.fileTree(compileStubsTask.outputDir).apply { - builtBy(compileStubsTask) - include("**/*.bc") - }) + library(compileStubsTask.artifactPath) nativeLibraries(project.fileTree(generateStubsTask.libsDir).apply { builtBy(generateStubsTask) include("**/*.bc")