kotlin-test-js: assemble sources jar that combines common and platform sources, KT-61315, KTIJ-23784

This commit is contained in:
Ilya Gorbunov
2023-08-20 16:14:34 +02:00
committed by Space Team
parent 2cb6ee81a1
commit e103318432
2 changed files with 5 additions and 11 deletions
+1 -1
View File
@@ -479,7 +479,7 @@ publishing {
val kotlinTestJsPublication = register("js", MavenPublication::class) { val kotlinTestJsPublication = register("js", MavenPublication::class) {
artifactId = "kotlin-test-js" artifactId = "kotlin-test-js"
from(jsComponent) from(jsComponent)
artifact(tasks.getByPath(":kotlin-test:kotlin-test-js:sourcesJar") as Jar) artifact(tasks.getByPath(":kotlin-test:kotlin-test-js-ir:jsSourcesJar") as org.gradle.jvm.tasks.Jar)
artifact(tasks.getByPath(":kotlin-test:kotlin-test-js:javadocJar") as Jar) artifact(tasks.getByPath(":kotlin-test:kotlin-test-js:javadocJar") as Jar)
configureKotlinPomAttributes(project, "Kotlin Test for JS") configureKotlinPomAttributes(project, "Kotlin Test for JS")
} }
+4 -10
View File
@@ -18,7 +18,7 @@ val commonTestSources by task<Sync> {
} }
val jsMainSources by task<Sync> { val jsMainSources by task<Sync> {
from("$rootDir/libraries/kotlin.test/js/src") from("$rootDir/libraries/kotlin.test/js/src/main")
into("$buildDir/jsMainSources") into("$buildDir/jsMainSources")
} }
@@ -32,13 +32,13 @@ kotlin {
dependencies { dependencies {
api(kotlinStdlib("mpp")) api(kotlinStdlib("mpp"))
} }
kotlin.srcDir(commonMainSources.get().destinationDir) kotlin.srcDir(commonMainSources)
} }
named("commonTest") { named("commonTest") {
kotlin.srcDir(commonTestSources.get().destinationDir) kotlin.srcDir(commonTestSources)
} }
named("jsMain") { named("jsMain") {
kotlin.srcDir(jsMainSources.get().destinationDir) kotlin.srcDir(jsMainSources)
} }
} }
} }
@@ -53,11 +53,5 @@ tasks.withType<KotlinCompile<*>>().configureEach {
tasks.named("compileKotlinJs") { tasks.named("compileKotlinJs") {
(this as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin-test" (this as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin-test"
dependsOn(commonMainSources)
dependsOn(jsMainSources)
}
tasks.named("compileTestKotlinJs") {
dependsOn(commonTestSources)
} }