azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Build] Fix JPS build issue caused by :plugins:jso module

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2024-01-11 14:04:25 +02:00
committed by Space Team
parent a0ba878b1d
commit dbbfb23fa9
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/jso/compiler-plugin/build.gradle.kts
+10 -8
View File
@@ -39,15 +39,17 @@ dependencies {
testImplementation(libs.junit.jupiter.api) testImplementation(libs.junit.jupiter.api)
testRuntimeOnly(libs.junit.jupiter.engine) 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")) { embedded(project(":plugins:jso:runtime")) {
attributes { attributes {
attribute(KotlinPlatformType.attribute, KotlinPlatformType.js) attribute(KotlinPlatformType.attribute, KotlinPlatformType.js)
attribute(KotlinJsCompilerAttribute.jsCompilerAttribute, KotlinJsCompilerAttribute.ir) attribute(KotlinJsCompilerAttribute.jsCompilerAttribute, KotlinJsCompilerAttribute.ir)
attribute(Usage.USAGE_ATTRIBUTE, objects.named(KotlinUsages.KOTLIN_RUNTIME)) attribute(Usage.USAGE_ATTRIBUTE, objects.named(KotlinUsages.KOTLIN_RUNTIME))
}
isTransitive = false
} }
isTransitive = false
} }
testRuntimeOnly(project(":core:descriptors.runtime")) 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")
settings.gradle
+7 -4
View File
@@ -288,9 +288,12 @@ include ":plugins:jso:compiler-plugin",
":plugins:jso:compiler-plugin:jso.common", ":plugins:jso:compiler-plugin:jso.common",
":plugins:jso:compiler-plugin:jso.k2", ":plugins:jso:compiler-plugin:jso.k2",
":plugins:jso:compiler-plugin:jso.backend", ":plugins:jso:compiler-plugin:jso.backend",
":plugins:jso:compiler-plugin:jso.cli", ":plugins:jso:compiler-plugin:jso.cli"
":plugins:jso:runtime",
":libraries:tools:jso" if (!buildProperties.inJpsBuildIdeaSync) {
include ":plugins:jso:runtime",
":libraries:tools:jso"
}
include ":compiler:fir", include ":compiler:fir",
":compiler:fir:cones", ":compiler:fir:cones",
@@ -875,4 +878,4 @@ if (buildProperties.isKotlinNativeEnabled) {
include ':kotlin-native:libclangext' include ':kotlin-native:libclangext'
include ':kotlin-native:backend.native:tests' include ':kotlin-native:backend.native:tests'
include ":kotlin-native:prepare:kotlin-native-compiler-embeddable" include ":kotlin-native:prepare:kotlin-native-compiler-embeddable"
} }