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

KPM/Gradle: don't include host-specific klibs into the common metadata

Browse Source
This commit is contained in:
Sergey Igushkin
2021-12-20 22:14:24 +04:00
committed by Space
parent c3fe4e7fb2
commit 57b85e155c
1 changed files with 6 additions and 3 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/plugin/mpp/pm20/fragmentsMetadataCompilation.kt
+6 -3
View File
@@ -10,7 +10,6 @@ import org.gradle.api.Project
import org.gradle.api.attributes.Usage import org.gradle.api.attributes.Usage
import org.gradle.api.tasks.TaskProvider import org.gradle.api.tasks.TaskProvider
import org.gradle.jvm.tasks.Jar import org.gradle.jvm.tasks.Jar
import org.jetbrains.kotlin.gradle.dsl.pm20Extension
import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.plugin.*
import org.jetbrains.kotlin.gradle.plugin.KotlinCommonSourceSetProcessor import org.jetbrains.kotlin.gradle.plugin.KotlinCommonSourceSetProcessor
import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.*
@@ -153,8 +152,12 @@ private fun configureMetadataJarTask(
module.fragments.all { fragment -> module.fragments.all { fragment ->
allMetadataJar.configure { jar -> allMetadataJar.configure { jar ->
val metadataOutput = project.files(Callable { val metadataOutput = project.files(Callable {
val compilationData = registry.byFragment(fragment) val compilationData = registry.getForFragmentOrNull(fragment)
project.filesWithUnpackedArchives(compilationData.output.allOutputs, setOf(KLIB_FILE_EXTENSION)) compilationData?.run {
if (!fragment.isNativeHostSpecific())
project.filesWithUnpackedArchives(compilationData.output.allOutputs, setOf(KLIB_FILE_EXTENSION))
else emptyList<Any>()
} ?: emptyList<Any>()
}) })
jar.from(metadataOutput) { spec -> jar.from(metadataOutput) { spec ->
spec.into(fragment.fragmentName) spec.into(fragment.fragmentName)