[Build] Fix JPS build issue caused by :plugins:jso module
This commit is contained in:
committed by
Space Team
parent
a0ba878b1d
commit
dbbfb23fa9
@@ -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")
|
||||
val generateTests by generator("org.jetbrains.kotlinx.jso.TestGeneratorKt")
|
||||
|
||||
+7
-4
@@ -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"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user