diff --git a/plugins/jso/compiler-plugin/build.gradle.kts b/plugins/jso/compiler-plugin/build.gradle.kts index 319aa0d6317..7448c679b50 100644 --- a/plugins/jso/compiler-plugin/build.gradle.kts +++ b/plugins/jso/compiler-plugin/build.gradle.kts @@ -39,15 +39,17 @@ dependencies { testImplementation(libs.junit.jupiter.api) testRuntimeOnly(libs.junit.jupiter.engine) - jsoIrRuntimeForTests(project(":plugins:jso:runtime")) { isTransitive = false } + if (!project.kotlinBuildProperties.isInJpsBuildIdeaSync) { + jsoIrRuntimeForTests(project(":plugins:jso:runtime")) { isTransitive = false } - embedded(project(":plugins:jso:runtime")) { - attributes { - attribute(KotlinPlatformType.attribute, KotlinPlatformType.js) - attribute(KotlinJsCompilerAttribute.jsCompilerAttribute, KotlinJsCompilerAttribute.ir) - attribute(Usage.USAGE_ATTRIBUTE, objects.named(KotlinUsages.KOTLIN_RUNTIME)) + embedded(project(":plugins:jso:runtime")) { + attributes { + attribute(KotlinPlatformType.attribute, KotlinPlatformType.js) + attribute(KotlinJsCompilerAttribute.jsCompilerAttribute, KotlinJsCompilerAttribute.ir) + attribute(Usage.USAGE_ATTRIBUTE, objects.named(KotlinUsages.KOTLIN_RUNTIME)) + } + isTransitive = false } - isTransitive = false } testRuntimeOnly(project(":core:descriptors.runtime")) @@ -85,4 +87,4 @@ projectTest(parallel = true, jUnitMode = JUnitMode.JUnit5) { } } -val generateTests by generator("org.jetbrains.kotlinx.jso.TestGeneratorKt") \ No newline at end of file +val generateTests by generator("org.jetbrains.kotlinx.jso.TestGeneratorKt") diff --git a/settings.gradle b/settings.gradle index 773c8b50990..b4a8de4145f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -288,9 +288,12 @@ include ":plugins:jso:compiler-plugin", ":plugins:jso:compiler-plugin:jso.common", ":plugins:jso:compiler-plugin:jso.k2", ":plugins:jso:compiler-plugin:jso.backend", - ":plugins:jso:compiler-plugin:jso.cli", - ":plugins:jso:runtime", - ":libraries:tools:jso" + ":plugins:jso:compiler-plugin:jso.cli" + +if (!buildProperties.inJpsBuildIdeaSync) { + include ":plugins:jso:runtime", + ":libraries:tools:jso" +} include ":compiler:fir", ":compiler:fir:cones", @@ -875,4 +878,4 @@ if (buildProperties.isKotlinNativeEnabled) { include ':kotlin-native:libclangext' include ':kotlin-native:backend.native:tests' include ":kotlin-native:prepare:kotlin-native-compiler-embeddable" -} \ No newline at end of file +}