From cc55580300e122b056378e88afe1fab8cfc92991 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 3 Feb 2021 17:19:24 +0300 Subject: [PATCH] Exclude kotlin-test root project during JPS sync --- settings.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings.gradle b/settings.gradle index 3dfe1de7956..5e9da894abf 100644 --- a/settings.gradle +++ b/settings.gradle @@ -210,7 +210,6 @@ include ":benchmarks", ":kotlin-script-runtime", ":plugins:fir:fir-plugin-prototype", ":plugins:fir:fir-plugin-prototype:plugin-annotations", - ":kotlin-test", ":kotlin-test:kotlin-test-common", ":kotlin-test:kotlin-test-annotations-common", ":kotlin-test:kotlin-test-jvm", @@ -415,6 +414,7 @@ if (buildProperties.inJpsBuildIdeaSync) { ":include:kotlin-stdlib-common-sources", + ":kotlin-test", ":kotlin-test:kotlin-test-js", ":kotlin-test:kotlin-test-js-ir", ":kotlin-test:kotlin-test-js:kotlin-test-js-it" @@ -433,6 +433,7 @@ if (buildProperties.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').projectDir = "$rootDir/libraries/kotlin.test" as File project(':kotlin-test:kotlin-test-js').projectDir = "$rootDir/libraries/kotlin.test/js" as File project(':kotlin-test:kotlin-test-js-ir').projectDir = "$rootDir/libraries/kotlin.test/js-ir" as File project(':kotlin-test:kotlin-test-js:kotlin-test-js-it').projectDir = "$rootDir/libraries/kotlin.test/js/it" as File @@ -441,7 +442,6 @@ if (buildProperties.inJpsBuildIdeaSync) { rootProject.name = "kotlin" project(':kotlin-script-runtime').projectDir = "$rootDir/libraries/tools/script-runtime" as File -project(':kotlin-test').projectDir = "$rootDir/libraries/kotlin.test" as File project(':kotlin-test:kotlin-test-common').projectDir = "$rootDir/libraries/kotlin.test/common" as File project(':kotlin-test:kotlin-test-annotations-common').projectDir = "$rootDir/libraries/kotlin.test/annotations-common" as File project(':kotlin-test:kotlin-test-jvm').projectDir = "$rootDir/libraries/kotlin.test/jvm" as File