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

Fix source JARs missing in Kotlin/Native targets with HMPP (KT-39051)

Browse Source 
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
This commit is contained in:
Sergey Igushkin
2020-08-03 12:39:17 +04:00
parent a766369e72
commit 988480d649
1 changed files with 8 additions and 1 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/targets/native/KotlinNativeTarget.kt
+8 -1
View File
@@ -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.KotlinNativeSimulatorTestRun
import org.jetbrains.kotlin.gradle.targets.native.NativeBinaryTestRunSource import org.jetbrains.kotlin.gradle.targets.native.NativeBinaryTestRunSource
import org.jetbrains.kotlin.gradle.tasks.locateOrRegisterTask 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.HostManager
import org.jetbrains.kotlin.konan.target.KonanTarget import org.jetbrains.kotlin.konan.target.KonanTarget
import javax.inject.Inject 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 = override val binaries =