From 299e508204dc04f5615fd246c45f4172de2a676f Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Wed, 5 Sep 2018 16:27:48 +0300 Subject: [PATCH] Add libraries provided by the K/N compiler in dependencies --- .../org/jetbrains/kotlin/gradle/tasks/KotlinNativeTasks.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinNativeTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinNativeTasks.kt index 45f186c1c2e..58e3513b786 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinNativeTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinNativeTasks.kt @@ -59,6 +59,9 @@ open class KotlinNativeCompile : DefaultTask() { val kotlinNativeVersion: String @Input get() = KonanCompilerDownloadTask.compilerVersion.toString() + val kotlinNativeHome: File + @Input get() = project.file(project.konanHome) + // We manually register this property as output file or directory depending on output kind. @Internal val outputFile: Property = project.objects.property(File::class.java) @@ -132,7 +135,7 @@ open class KotlinNativeCompile : DefaultTask() { libraries.files.filter { // Support only klib files for now. - it.extension == "klib" && !it.providedByCompiler + it.extension == "klib" || !it.providedByCompiler }.forEach { library -> library.parent?.let { addArg("-r", it) } addArg("-l", library.nameWithoutExtension)