[JS] Remove kotlin-test-js build from JPS

kotlin-test-js is also built by JS IR backend
JS IR backend does not support JPS yet
This commit is contained in:
Svyatoslav Kuzmich
2019-11-14 18:02:56 +03:00
parent c8e5b2f2f8
commit a46e970f47
5 changed files with 17 additions and 11 deletions
+2 -2
View File
@@ -260,7 +260,7 @@ val coreLibProjects = listOfNotNull(
":kotlin-test:kotlin-test-junit",
":kotlin-test:kotlin-test-junit5",
":kotlin-test:kotlin-test-testng",
":kotlin-test:kotlin-test-js",
":kotlin-test:kotlin-test-js".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
":kotlin-reflect"
)
@@ -472,7 +472,7 @@ tasks {
register("coreLibsTest") {
(coreLibProjects + listOf(
":kotlin-stdlib:samples",
":kotlin-test:kotlin-test-js:kotlin-test-js-it",
":kotlin-test:kotlin-test-js:kotlin-test-js-it".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
":kotlinx-metadata-jvm",
":tools:binary-compatibility-validator"
)).forEach {
+3 -1
View File
@@ -63,7 +63,9 @@ dependencies {
testRuntime(kotlinStdlib())
testJsRuntime(kotlinStdlib("js"))
testJsRuntime(project(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
testJsRuntime(project(":kotlin-test:kotlin-test-js")) // to be sure that kotlin-test-js built before tests runned
}
testRuntime(project(":kotlin-reflect"))
testRuntime(project(":kotlin-preloader")) // it's required for ant tests
testRuntime(project(":compiler:backend-common"))
@@ -19,7 +19,9 @@ convention.getPlugin(MavenPluginConvention::class.java).also {
}
dependencies {
archives(project(":kotlin-test:kotlin-test-js"))
if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
archives(project(":kotlin-test:kotlin-test-js"))
}
}
node {
+2 -2
View File
@@ -90,7 +90,7 @@ val distLibraryProjects = listOfNotNull(
":js:js.engines",
":kotlin-stdlib-js-ir".takeIf { kotlinBuildProperties.jsIrDist },
":kotlin-source-sections-compiler-plugin",
":kotlin-test:kotlin-test-js",
":kotlin-test:kotlin-test-js".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
":kotlin-test:kotlin-test-junit",
":kotlin-test:kotlin-test-junit5",
":kotlin-test:kotlin-test-jvm",
@@ -112,7 +112,7 @@ val distSourcesProjects = listOfNotNull(
":kotlin-annotations-jvm",
":kotlin-script-runtime",
":kotlin-stdlib-js-ir".takeIf { kotlinBuildProperties.jsIrDist },
":kotlin-test:kotlin-test-js",
":kotlin-test:kotlin-test-js".takeIf { !kotlinBuildProperties.isInJpsBuildIdeaSync },
":kotlin-test:kotlin-test-junit",
":kotlin-test:kotlin-test-junit5",
":kotlin-test:kotlin-test-jvm",
+7 -5
View File
@@ -153,8 +153,6 @@ include ":kotlin-build-common",
":kotlin-test:kotlin-test-junit",
":kotlin-test:kotlin-test-junit5",
":kotlin-test:kotlin-test-testng",
":kotlin-test:kotlin-test-js",
":kotlin-test:kotlin-test-js:kotlin-test-js-it",
":kotlin-test-js-runner",
":kotlin-source-map-loader",
":kotlinx-metadata",
@@ -292,7 +290,10 @@ if (flags.inJpsBuildIdeaSync) {
":tools:binary-compatibility-validator",
":tools:kotlin-stdlib-gen",
":include:kotlin-stdlib-common-sources"
":include:kotlin-stdlib-common-sources",
":kotlin-test:kotlin-test-js",
":kotlin-test:kotlin-test-js:kotlin-test-js-it"
project(':kotlin-stdlib-common').projectDir = "$rootDir/libraries/stdlib/common" as File
project(':kotlin-stdlib').projectDir = "$rootDir/libraries/stdlib/jvm" as File
@@ -305,6 +306,9 @@ if (flags.inJpsBuildIdeaSync) {
project(':tools:binary-compatibility-validator').projectDir = "$rootDir/libraries/tools/binary-compatibility-validator" as File
project(':tools:kotlin-stdlib-gen').projectDir = "$rootDir/libraries/tools/kotlin-stdlib-gen" as File
project(':kotlin-test:kotlin-test-js').projectDir = "$rootDir/libraries/kotlin.test/js" as File
project(':kotlin-test:kotlin-test-js:kotlin-test-js-it').projectDir = "$rootDir/libraries/kotlin.test/js/it" as File
}
rootProject.name = "kotlin"
@@ -317,8 +321,6 @@ project(':kotlin-test:kotlin-test-jvm').projectDir = "$rootDir/libraries/kotlin.
project(':kotlin-test:kotlin-test-junit').projectDir = "$rootDir/libraries/kotlin.test/junit" as File
project(':kotlin-test:kotlin-test-junit5').projectDir = "$rootDir/libraries/kotlin.test/junit5" as File
project(':kotlin-test:kotlin-test-testng').projectDir = "$rootDir/libraries/kotlin.test/testng" as File
project(':kotlin-test:kotlin-test-js').projectDir = "$rootDir/libraries/kotlin.test/js" as File
project(':kotlin-test:kotlin-test-js:kotlin-test-js-it').projectDir = "$rootDir/libraries/kotlin.test/js/it" as File
project(':kotlin-test-js-runner').projectDir = "$rootDir/libraries/tools/kotlin-test-js-runner" as File
project(':kotlin-source-map-loader').projectDir = "$rootDir/libraries/tools/kotlin-source-map-loader" as File
project(':kotlin-reflect').projectDir = "$rootDir/libraries/reflect" as File