diff --git a/build.gradle.kts b/build.gradle.kts index 1047a79fd41..77d852905c8 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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 { diff --git a/js/js.tests/build.gradle.kts b/js/js.tests/build.gradle.kts index 0e7e0de16f4..8d5c77cc8ea 100644 --- a/js/js.tests/build.gradle.kts +++ b/js/js.tests/build.gradle.kts @@ -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")) diff --git a/libraries/tools/kotlin-test-js-runner/build.gradle.kts b/libraries/tools/kotlin-test-js-runner/build.gradle.kts index eeeec8082a5..a979f64930c 100644 --- a/libraries/tools/kotlin-test-js-runner/build.gradle.kts +++ b/libraries/tools/kotlin-test-js-runner/build.gradle.kts @@ -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 { diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 43b8d410cec..b83ea368a49 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -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", diff --git a/settings.gradle b/settings.gradle index 8bc3b93dcc4..bac5a7460a7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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