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

[Gradle, JS] Fix attribute type on type of zip

Browse Source
This commit is contained in:
Ilya Goncharov
2020-01-22 19:15:30 +03:00
parent b3067d655e
commit 4d323d3567
1 changed files with 17 additions and 5 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/KotlinTargetConfigurator.kt
+17 -5
View File
@@ -28,6 +28,8 @@ import org.gradle.language.jvm.tasks.ProcessResources
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions import org.jetbrains.kotlin.gradle.dsl.KotlinCommonOptions
import org.jetbrains.kotlin.gradle.dsl.kotlinExtension import org.jetbrains.kotlin.gradle.dsl.kotlinExtension
import org.jetbrains.kotlin.gradle.plugin.mpp.* import org.jetbrains.kotlin.gradle.plugin.mpp.*
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsTarget
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName import org.jetbrains.kotlin.gradle.utils.lowerCamelCaseName
import java.util.concurrent.Callable import java.util.concurrent.Callable
import kotlin.reflect.KMutableProperty1 import kotlin.reflect.KMutableProperty1
@@ -378,25 +380,25 @@ abstract class KotlinOnlyTargetConfigurator<KotlinCompilationType : KotlinCompil
jarArtifact.type = type jarArtifact.type = type
val apiElementsConfiguration = project.configurations.getByName(target.apiElementsConfigurationName) val apiElementsConfiguration = project.configurations.getByName(target.apiElementsConfigurationName)
addJar(apiElementsConfiguration, jarArtifact) addJar(apiElementsConfiguration, jarArtifact, type)
if (mainCompilation is KotlinCompilationToRunnableFiles<*>) { if (mainCompilation is KotlinCompilationToRunnableFiles<*>) {
val runtimeConfiguration = project.configurations.getByName(mainCompilation.deprecatedRuntimeConfigurationName) val runtimeConfiguration = project.configurations.getByName(mainCompilation.deprecatedRuntimeConfigurationName)
val runtimeElementsConfiguration = project.configurations.getByName(target.runtimeElementsConfigurationName) val runtimeElementsConfiguration = project.configurations.getByName(target.runtimeElementsConfigurationName)
addJar(runtimeConfiguration, jarArtifact) addJar(runtimeConfiguration, jarArtifact, type)
addJar(runtimeElementsConfiguration, jarArtifact) addJar(runtimeElementsConfiguration, jarArtifact, type)
// TODO Check Gradle's special split into variants for classes & resources -- do we need that too? // TODO Check Gradle's special split into variants for classes & resources -- do we need that too?
} }
} }
} }
} }
private fun addJar(configuration: Configuration, jarArtifact: PublishArtifact) { private fun addJar(configuration: Configuration, jarArtifact: PublishArtifact, type: String) {
val publications = configuration.outgoing val publications = configuration.outgoing
// Configure an implicit variant // Configure an implicit variant
publications.artifacts.add(jarArtifact) publications.artifacts.add(jarArtifact)
publications.attributes.attribute(ArtifactAttributes.ARTIFACT_FORMAT, ArtifactTypeDefinition.JAR_TYPE) publications.attributes.attribute(ArtifactAttributes.ARTIFACT_FORMAT, type)
} }
} }
@@ -444,6 +446,16 @@ internal fun Project.usageByName(usageName: String): Usage =
fun Configuration.usesPlatformOf(target: KotlinTarget): Configuration { fun Configuration.usesPlatformOf(target: KotlinTarget): Configuration {
attributes.attribute(KotlinPlatformType.attribute, target.platformType) attributes.attribute(KotlinPlatformType.attribute, target.platformType)
println("$target ${target is KotlinJsTarget}")
if (target is KotlinJsTarget) {
attributes.attribute(KotlinJsTarget.jsTargetAttribute, "legacy")
}
if (target is KotlinJsIrTarget) {
attributes.attribute(KotlinJsTarget.jsTargetAttribute, "ir")
}
// TODO: Provide an universal way to copy attributes from the target. // TODO: Provide an universal way to copy attributes from the target.
if (target is KotlinNativeTarget) { if (target is KotlinNativeTarget) {
attributes.attribute(KotlinNativeTarget.konanTargetAttribute, target.konanTarget.name) attributes.attribute(KotlinNativeTarget.konanTargetAttribute, target.konanTarget.name)