From 988480d649ac82b650c799225915184bf29167d1 Mon Sep 17 00:00:00 2001 From: Sergey Igushkin Date: Mon, 3 Aug 2020 12:39:17 +0400 Subject: [PATCH] Fix source JARs missing in Kotlin/Native targets with HMPP (KT-39051) With HMPP, a separate implementation of `kotlinComponents` is used which accidentally ignored the parent's logic for source artifacts. As a simple fix, copy the parent's logic for source artifacts. Issue #KT-39051 Fixed --- .../kotlin/gradle/targets/native/KotlinNativeTarget.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt index 00412e4909b..c0718fda756 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/native/KotlinNativeTarget.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.gradle.targets.native.KotlinNativeHostTestRun import org.jetbrains.kotlin.gradle.targets.native.KotlinNativeSimulatorTestRun import org.jetbrains.kotlin.gradle.targets.native.NativeBinaryTestRunSource import org.jetbrains.kotlin.gradle.tasks.locateOrRegisterTask +import org.jetbrains.kotlin.gradle.utils.dashSeparatedName import org.jetbrains.kotlin.konan.target.HostManager import org.jetbrains.kotlin.konan.target.KonanTarget import javax.inject.Inject @@ -106,7 +107,13 @@ open class KotlinNativeTarget @Inject constructor( } } - setOf(createKotlinVariant(targetName, mainCompilation, mutableUsageContexts)) + val result = createKotlinVariant(targetName, mainCompilation, mutableUsageContexts) + + result.sourcesArtifacts = setOf( + sourcesJarArtifact(mainCompilation, targetName, dashSeparatedName(targetName.toLowerCase())) + ) + + setOf(result) } override val binaries =