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

Refactor & minor fix in software component logic of AbstractKotlinTarget

Browse Source 
* Create the sources JAR for both Gradle 4.7+ and versions below 4.7
* Set `componentName` in all branches of `createKotlinVariant`
This commit is contained in:
Sergey Igushkin
2019-02-28 18:41:10 +03:00
parent 5b5316214f
commit 03b74343c8
1 changed files with 29 additions and 30 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/kotlinTargets.kt
+29 -30
View File
@@ -59,21 +59,20 @@ abstract class AbstractKotlinTarget(
internal open val kotlinComponents: Set<KotlinTargetComponent> by lazy {
val mainCompilation = compilations.getByName(KotlinCompilation.MAIN_COMPILATION_NAME)
val usageContexts = createUsageContexts(mainCompilation)
setOf(
if (isGradleVersionAtLeast(4, 7)) {
val componentName = mainCompilation.target.name
createKotlinVariant(componentName, mainCompilation, usageContexts).apply {
sourcesArtifacts = setOf(
sourcesJarArtifact(
mainCompilation, componentName,
dashSeparatedName(target.name.toLowerCase(), componentName.toLowerCase())
)
)
}
} else {
KotlinVariant(mainCompilation, usageContexts)
}
val componentName = mainCompilation.target.name
val result = if (isGradleVersionAtLeast(4, 7)) {
createKotlinVariant(componentName, mainCompilation, usageContexts)
} else {
KotlinVariant(mainCompilation, usageContexts)
}
result.sourcesArtifacts = setOf(
sourcesJarArtifact(mainCompilation, componentName, dashSeparatedName(targetName.toLowerCase()))
)
setOf(result).also { project.components.addAll(it) }
}
override val components: Set<SoftwareComponent> by lazy {
@@ -160,24 +159,24 @@ abstract class AbstractKotlinTarget(
compilation: KotlinCompilation<*>,
usageContexts: Set<DefaultKotlinUsageContext>
): KotlinVariant {
val kotlinExtension = project.kotlinExtension
val kotlinExtension = project.kotlinExtension as? KotlinMultiplatformExtension
?: return KotlinVariantWithCoordinates(compilation, usageContexts)
val result =
if (kotlinExtension !is KotlinMultiplatformExtension || targetName == KotlinMultiplatformPlugin.METADATA_TARGET_NAME)
KotlinVariantWithCoordinates(compilation, usageContexts)
else {
val metadataTarget =
kotlinExtension.targets.getByName(KotlinMultiplatformPlugin.METADATA_TARGET_NAME) as AbstractKotlinTarget
if (targetName == KotlinMultiplatformPlugin.METADATA_TARGET_NAME)
return KotlinVariantWithCoordinates(compilation, usageContexts)
val separateMetadataTarget =
kotlinExtension.targets.getByName(KotlinMultiplatformPlugin.METADATA_TARGET_NAME) as AbstractKotlinTarget
val result = if (kotlinExtension.isGradleMetadataAvailable) {
KotlinVariantWithMetadataVariant(compilation, usageContexts, separateMetadataTarget)
} else {
// we should only add the Kotlin metadata dependency if we publish no Gradle metadata related to Kotlin MPP;
// with metadata, such a dependency would get invalid, since a platform module should only depend on modules for that
// same platform, not Kotlin metadata modules
KotlinVariantWithMetadataDependency(compilation, usageContexts, separateMetadataTarget)
}
if (kotlinExtension.isGradleMetadataAvailable) {
KotlinVariantWithMetadataVariant(compilation, usageContexts, metadataTarget)
} else {
// we should only add the Kotlin metadata dependency if we publish no Gradle metadata related to Kotlin MPP;
// with metadata, such a dependency would get invalid, since a platform module should only depend on modules for that
// same platform, not Kotlin metadata modules
KotlinVariantWithMetadataDependency(compilation, usageContexts, metadataTarget)
}
}
result.componentName = componentName
return result