[stdlib-mpp] Disable js-v1 test execution and compilation and remove the corresponding workarounds
KT-56106
This commit is contained in:
committed by
Space Team
parent
09bb0b5566
commit
19cbd4dd3e
@@ -1,12 +1,10 @@
|
|||||||
import org.gradle.api.internal.component.SoftwareComponentInternal
|
import org.gradle.api.internal.component.SoftwareComponentInternal
|
||||||
import org.gradle.api.internal.component.UsageContext
|
import org.gradle.api.internal.component.UsageContext
|
||||||
import java.nio.file.*
|
import java.nio.file.*
|
||||||
import org.gradle.kotlin.dsl.support.serviceOf
|
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
|
import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsTargetDsl
|
||||||
import org.jetbrains.kotlin.gradle.tasks.UsesKotlinJavaToolchain
|
import org.jetbrains.kotlin.gradle.tasks.UsesKotlinJavaToolchain
|
||||||
import plugins.configureDefaultPublishing
|
import plugins.configureDefaultPublishing
|
||||||
import org.gradle.jvm.tasks.Jar
|
import org.gradle.jvm.tasks.Jar
|
||||||
import org.jetbrains.kotlin.gradle.tasks.Kotlin2JsCompile
|
|
||||||
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
|
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
|
||||||
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
|
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
|
||||||
import plugins.configureKotlinPomAttributes
|
import plugins.configureKotlinPomAttributes
|
||||||
@@ -47,7 +45,6 @@ val jsSrcJsDir = "${jsSrcDir}/js"
|
|||||||
// for js-ir
|
// for js-ir
|
||||||
val jsIrDir = "${projectDir}/js-ir"
|
val jsIrDir = "${projectDir}/js-ir"
|
||||||
val jsIrMainSources = "${buildDir}/src/jsMainSources"
|
val jsIrMainSources = "${buildDir}/src/jsMainSources"
|
||||||
val jsIrTestSources = "${buildDir}/src/jsTestSources"
|
|
||||||
lateinit var jsIrTarget: KotlinJsTargetDsl
|
lateinit var jsIrTarget: KotlinJsTargetDsl
|
||||||
lateinit var jsV1Target: KotlinJsTargetDsl
|
lateinit var jsV1Target: KotlinJsTargetDsl
|
||||||
|
|
||||||
@@ -162,14 +159,9 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
jsV1Target = js("jsV1", LEGACY) {
|
jsV1Target = js("jsV1", LEGACY) {
|
||||||
if (!kotlinBuildProperties.isTeamcityBuild) {
|
|
||||||
browser {}
|
|
||||||
}
|
|
||||||
nodejs {
|
nodejs {
|
||||||
testTask {
|
testTask {
|
||||||
useMocha {
|
enabled = false
|
||||||
timeout = "10s"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
compilations {
|
compilations {
|
||||||
@@ -206,6 +198,9 @@ kotlin {
|
|||||||
kotlinOptions {
|
kotlinOptions {
|
||||||
moduleKind = "umd"
|
moduleKind = "umd"
|
||||||
}
|
}
|
||||||
|
compileTaskProvider.configure {
|
||||||
|
exclude("*")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -355,15 +350,6 @@ kotlin {
|
|||||||
into(builtinsSrcDir)
|
into(builtinsSrcDir)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val jsV1Test by getting {
|
|
||||||
dependencies {
|
|
||||||
api(project(":kotlin-test:kotlin-test-js-v1"))
|
|
||||||
}
|
|
||||||
kotlin {
|
|
||||||
srcDir(jsCommonTestSrcDir)
|
|
||||||
srcDir("$jsV1Dir/test")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val jsMain by getting {
|
val jsMain by getting {
|
||||||
val prepareJsIrMainSources by tasks.registering(Sync::class)
|
val prepareJsIrMainSources by tasks.registering(Sync::class)
|
||||||
@@ -434,11 +420,7 @@ kotlin {
|
|||||||
dependencies {
|
dependencies {
|
||||||
api(project(":kotlin-test:kotlin-test-js-ir"))
|
api(project(":kotlin-test:kotlin-test-js-ir"))
|
||||||
}
|
}
|
||||||
val prepareJsIrTestSources by tasks.registering(Sync::class) {
|
kotlin.srcDir(jsCommonTestSrcDir)
|
||||||
from(jsCommonTestSrcDir)
|
|
||||||
into(jsIrTestSources)
|
|
||||||
}
|
|
||||||
kotlin.srcDir(prepareJsIrTestSources)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
all sourceSet@ {
|
all sourceSet@ {
|
||||||
@@ -601,20 +583,6 @@ tasks {
|
|||||||
dependsOn(mergeJsV1)
|
dependsOn(mergeJsV1)
|
||||||
}
|
}
|
||||||
|
|
||||||
jsV1Target.compilations["test"].compileTaskProvider.configure {
|
|
||||||
val fs = serviceOf<FileSystemOperations>()
|
|
||||||
val jsOutputFileName = jsOutputFileName
|
|
||||||
val kotlinTestJsV1Output = (project.tasks.getByPath(":kotlin-test:kotlin-test-js-v1:compileKotlinJs") as Kotlin2JsCompile).outputFileProperty
|
|
||||||
doLast {
|
|
||||||
// copy freshly-built legacy kotlin.js into node_modules subdir of kotlin-stdlib-js-v1-test module
|
|
||||||
fs.copy {
|
|
||||||
from(jsOutputFileName)
|
|
||||||
from(kotlinTestJsV1Output)
|
|
||||||
into(destinationDirectory.dir("node_modules"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
val jsResultingJar by registering(Jar::class) {
|
val jsResultingJar by registering(Jar::class) {
|
||||||
archiveClassifier.set("js")
|
archiveClassifier.set("js")
|
||||||
archiveVersion.set("")
|
archiveVersion.set("")
|
||||||
|
|||||||
Reference in New Issue
Block a user