azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix K/N module compilation in MPP project imported from Gradle #KT-26688

Browse Source
This commit is contained in:
Dmitriy Dolovov
2018-09-10 10:57:01 +03:00
parent 4c7972a9e8
commit 5183eba70b
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/KotlinNativeTasks.kt
+1 -4
View File
@@ -59,9 +59,6 @@ open class KotlinNativeCompile : DefaultTask() {
val kotlinNativeVersion: String val kotlinNativeVersion: String
@Input get() = KonanCompilerDownloadTask.compilerVersion.toString() @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. // We manually register this property as output file or directory depending on output kind.
@Internal @Internal
val outputFile: Property<File> = project.objects.property(File::class.java) val outputFile: Property<File> = project.objects.property(File::class.java)
@@ -135,7 +132,7 @@ open class KotlinNativeCompile : DefaultTask() {
libraries.files.filter { libraries.files.filter {
// Support only klib files for now. // Support only klib files for now.
it.extension == "klib" || !it.providedByCompiler it.extension == "klib" && !it.providedByCompiler
}.forEach { library -> }.forEach { library ->
library.parent?.let { addArg("-r", it) } library.parent?.let { addArg("-r", it) }
addArg("-l", library.nameWithoutExtension) addArg("-l", library.nameWithoutExtension)