Return source and javadoc publication for kotlin-test-wasm
Setting packaging to klib didn't work because it was overwritten below. ^KTI-692 Fixed
This commit is contained in:
committed by
TeamCityServer
parent
18ed361f9b
commit
6a2c607862
@@ -103,10 +103,10 @@ var Project.mainPublicationName: String
|
||||
private fun humanReadableName(name: String) =
|
||||
name.split("-").joinToString(separator = " ") { it.capitalize(Locale.ROOT) }
|
||||
|
||||
fun MavenPublication.configureKotlinPomAttributes(project: Project, explicitDescription: String? = null) {
|
||||
fun MavenPublication.configureKotlinPomAttributes(project: Project, explicitDescription: String? = null, packaging: String = "jar") {
|
||||
val publication = this
|
||||
pom {
|
||||
packaging = "jar"
|
||||
this.packaging = packaging
|
||||
name.set(humanReadableName(publication.artifactId))
|
||||
description.set(explicitDescription ?: project.description ?: humanReadableName(publication.artifactId))
|
||||
url.set("https://kotlinlang.org/")
|
||||
|
||||
@@ -368,10 +368,11 @@ publishing {
|
||||
configureKotlinPomAttributes(project, "Kotlin Test for JS")
|
||||
}
|
||||
create("wasm", MavenPublication::class) {
|
||||
pom.packaging = "klib"
|
||||
artifactId = "kotlin-test-wasm"
|
||||
from(wasmComponent)
|
||||
configureKotlinPomAttributes(project, "Kotlin Test for WASM")
|
||||
artifact(tasks.getByPath(":kotlin-test:kotlin-test-wasm:sourcesJar") as Jar)
|
||||
artifact(emptyJavadocJar)
|
||||
configureKotlinPomAttributes(project, "Kotlin Test for WASM", packaging = "klib")
|
||||
}
|
||||
create("common", MavenPublication::class) {
|
||||
artifactId = "kotlin-test-common"
|
||||
|
||||
@@ -17,13 +17,15 @@ kotlin {
|
||||
nodejs()
|
||||
}
|
||||
|
||||
@Suppress("UNUSED_VARIABLE")
|
||||
sourceSets {
|
||||
val commonMain by getting {
|
||||
val commonMain by getting {
|
||||
dependencies {
|
||||
api(project(":kotlin-stdlib-wasm"))
|
||||
}
|
||||
kotlin.srcDir(commonMainSources.get().destinationDir)
|
||||
}
|
||||
|
||||
val wasmMain by getting {
|
||||
dependencies {
|
||||
api(project(":kotlin-stdlib-wasm"))
|
||||
@@ -45,3 +47,10 @@ tasks.named("compileKotlinWasm") {
|
||||
(this as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin-test"
|
||||
dependsOn(commonMainSources)
|
||||
}
|
||||
|
||||
tasks.register<Jar>("sourcesJar") {
|
||||
dependsOn(commonMainSources)
|
||||
archiveClassifier.set("sources")
|
||||
from(kotlin.sourceSets["commonMain"].kotlin)
|
||||
from(kotlin.sourceSets["wasmMain"].kotlin)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user