From e3ac2b661a7508efe7d14f07bdb5af0f77769c4e Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Thu, 18 Nov 2021 11:58:25 +0300 Subject: [PATCH] [K/N][build] Remove artifact overriding in library task Depending on noPack option compiler produces file or directory. Artifact field that contains .klib file can't use @OutputDirectory annotation. The same applies for @OutputFile with directory. --- kotlin-native/runtime/build.gradle.kts | 1 + .../kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/kotlin-native/runtime/build.gradle.kts b/kotlin-native/runtime/build.gradle.kts index 252e615acc9..05fcd82fd82 100644 --- a/kotlin-native/runtime/build.gradle.kts +++ b/kotlin-native/runtime/build.gradle.kts @@ -439,6 +439,7 @@ konanArtifacts { stdlibBuildTask = project.findKonanBuildTask("stdlib", project.platformManager.hostPlatform.target).apply { configure { dependsOn(":kotlin-native:distCompiler") + outputs.dir(project.buildDir.resolve("stdlib/$hostName/stdlib")) } } } diff --git a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt index 26f95ff30bc..440ea673219 100644 --- a/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt +++ b/kotlin-native/tools/kotlin-native-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/konan/tasks/KonanCompileTask.kt @@ -391,12 +391,6 @@ open class KonanCompileFrameworkTask: KonanCompileNativeBinary() { } open class KonanCompileLibraryTask: KonanCompileTask() { - override val artifact: File - @OutputDirectory get() = destinationDir.resolve(artifactFullName) - - override val artifactSuffix: String - @Internal get() = if (!noPack) produce.suffix(konanTarget) else "" - override fun buildCommonArgs() = super.buildCommonArgs().apply { addKey("-nopack", noPack) }