diff --git a/libraries/kotlin.test/build.gradle.kts b/libraries/kotlin.test/build.gradle.kts index 8cbf805e4cd..afdafc316d8 100644 --- a/libraries/kotlin.test/build.gradle.kts +++ b/libraries/kotlin.test/build.gradle.kts @@ -479,7 +479,7 @@ publishing { val kotlinTestJsPublication = register("js", MavenPublication::class) { artifactId = "kotlin-test-js" 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) configureKotlinPomAttributes(project, "Kotlin Test for JS") } diff --git a/libraries/kotlin.test/js-ir/build.gradle.kts b/libraries/kotlin.test/js-ir/build.gradle.kts index ed80b91eba3..f1c06908b93 100644 --- a/libraries/kotlin.test/js-ir/build.gradle.kts +++ b/libraries/kotlin.test/js-ir/build.gradle.kts @@ -18,7 +18,7 @@ val commonTestSources by task { } val jsMainSources by task { - from("$rootDir/libraries/kotlin.test/js/src") + from("$rootDir/libraries/kotlin.test/js/src/main") into("$buildDir/jsMainSources") } @@ -32,13 +32,13 @@ kotlin { dependencies { api(kotlinStdlib("mpp")) } - kotlin.srcDir(commonMainSources.get().destinationDir) + kotlin.srcDir(commonMainSources) } named("commonTest") { - kotlin.srcDir(commonTestSources.get().destinationDir) + kotlin.srcDir(commonTestSources) } named("jsMain") { - kotlin.srcDir(jsMainSources.get().destinationDir) + kotlin.srcDir(jsMainSources) } } } @@ -53,11 +53,5 @@ tasks.withType>().configureEach { tasks.named("compileKotlinJs") { (this as KotlinCompile<*>).kotlinOptions.freeCompilerArgs += "-Xir-module-name=kotlin-test" - dependsOn(commonMainSources) - dependsOn(jsMainSources) -} - -tasks.named("compileTestKotlinJs") { - dependsOn(commonTestSources) }