MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[fleet] [FL-33087] Do not set WASMJS source sets if not a KMP module

Browse Source 
GitOrigin-RevId: b89a4c6dd0f3a879d7a7631deb861c8378dc7c07
This commit is contained in:
Titouan Bion
2025-04-22 15:06:17 +00:00
committed by intellij-monorepo-bot
parent b9695ce61e
commit de60121067
14 changed files with 106 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fleet/andel/gradlebuild/build.gradle.kts
+8 -1
View File
@@ -4,7 +4,6 @@ import fleet.buildtool.jpms.withJavaSourceSet
// IMPORT__MARKER_END
plugins {
alias(libs.plugins.kotlin.multiplatform)
id("fleet.multiplatform-module-conventions")
id("fleet.project-module-conventions")
id("fleet.toolchain-conventions")
id("fleet.module-publishing-conventions")
@@ -31,6 +30,14 @@ kotlin {
"-Xlambdas=class",
"-opt-in=kotlin.concurrent.atomics.ExperimentalAtomicApi",
)
targets {
jvm {
withJava()
}
wasmJs {
browser {}
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonMain")) }
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcCommonMain")) }
fleet/compiler-plugins/gradlebuild/build.gradle.kts
+5 -4
View File
@@ -22,6 +22,11 @@ jpsModule {
kotlin {
// KOTLIN__MARKER_START
targets {
jvm {
withJava()
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonMain")) }
tasks.named("syncCommonTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonTest")) }
@@ -35,14 +40,10 @@ kotlin {
configureAtMostOneJvmTargetOrThrow { compilations.named("main") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.projectDirectory.dir("../srcJvmMain")) } } }
sourceSets.jvmTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../testJvmTest")) }
configureAtMostOneJvmTargetOrThrow { compilations.named("test") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.projectDirectory.dir("../testJvmTest")) } } }
sourceSets.wasmJsMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcWasmJsMain")) }
sourceSets.wasmJsTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../testWasmJsTest")) }
sourceSets.commonMain.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesCommonMain")) }
sourceSets.commonTest.configure { resources.srcDir(layout.projectDirectory.dir("../testResourcesCommonTest")) }
sourceSets.jvmMain.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesJvmMain")) }
sourceSets.jvmTest.configure { resources.srcDir(layout.projectDirectory.dir("../testResourcesJvmTest")) }
sourceSets.wasmJsMain.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesWasmJsMain")) }
sourceSets.wasmJsTest.configure { resources.srcDir(layout.projectDirectory.dir("../testResourcesWasmJsTest")) }
}
sourceSets.commonMain.dependencies {
runtimeOnly(jps.org.jetbrains.kotlin.kotlin.compose.compiler.plugin782483974.get().let { "${it.group}:${it.name}:${it.version}" }) {
fleet/fastutil/gradlebuild/build.gradle.kts
+8 -1
View File
@@ -5,7 +5,6 @@ import fleet.buildtool.jpms.withJavaSourceSet
plugins {
alias(libs.plugins.kotlin.multiplatform)
id("fleet.project-module-conventions")
id("fleet.multiplatform-module-conventions")
id("fleet.toolchain-conventions")
id("fleet.module-publishing-conventions")
id("fleet.sdk-repositories-publishing-conventions")
@@ -30,6 +29,14 @@ kotlin {
"-opt-in=kotlin.ExperimentalStdlibApi",
"-Xlambdas=class",
)
targets {
jvm {
withJava()
}
wasmJs {
browser {}
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonMain")) }
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcCommonMain")) }
fleet/kernel/gradlebuild/build.gradle.kts
+8 -1
View File
@@ -4,7 +4,6 @@ import fleet.buildtool.jpms.withJavaSourceSet
// IMPORT__MARKER_END
plugins {
alias(libs.plugins.kotlin.multiplatform)
id("fleet.multiplatform-module-conventions")
id("fleet.project-module-conventions")
id("fleet.toolchain-conventions")
id("fleet.module-publishing-conventions")
@@ -34,6 +33,14 @@ kotlin {
"-Xlambdas=class",
"-opt-in=kotlin.concurrent.atomics.ExperimentalAtomicApi",
)
targets {
jvm {
withJava()
}
wasmJs {
browser {}
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonMain")) }
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcCommonMain")) }
fleet/multiplatform.shims/gradlebuild/build.gradle.kts
+8 -1
View File
@@ -8,7 +8,6 @@ plugins {
id("fleet.project-module-conventions")
id("fleet.toolchain-conventions")
id("fleet.module-publishing-conventions")
id("fleet.multiplatform-module-conventions")
id("fleet.open-source-module-conventions")
id("fleet-build-jps-module-plugin")
alias(libs.plugins.dokka)
@@ -31,6 +30,14 @@ kotlin {
compilerOptions.freeCompilerArgs = listOf(
"-Xlambdas=class",
)
targets {
jvm {
withJava()
}
wasmJs {
browser {}
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonMain")) }
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcCommonMain")) }
fleet/reporting/api/gradlebuild/build.gradle.kts
+8 -1
View File
@@ -4,7 +4,6 @@ import fleet.buildtool.jpms.withJavaSourceSet
// IMPORT__MARKER_END
plugins {
alias(libs.plugins.kotlin.multiplatform)
id("fleet.multiplatform-module-conventions")
id("fleet.project-module-conventions")
id("fleet.toolchain-conventions")
id("fleet.module-publishing-conventions")
@@ -29,6 +28,14 @@ kotlin {
compilerOptions.freeCompilerArgs = listOf(
"-Xlambdas=class",
)
targets {
jvm {
withJava()
}
wasmJs {
browser {}
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonMain")) }
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcCommonMain")) }
fleet/reporting/shared/gradlebuild/build.gradle.kts
+8 -1
View File
@@ -4,7 +4,6 @@ import fleet.buildtool.jpms.withJavaSourceSet
// IMPORT__MARKER_END
plugins {
alias(libs.plugins.kotlin.multiplatform)
id("fleet.multiplatform-module-conventions")
id("fleet.project-module-conventions")
id("fleet.toolchain-conventions")
id("fleet.module-publishing-conventions")
@@ -31,6 +30,14 @@ kotlin {
"-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
"-Xlambdas=class",
)
targets {
jvm {
withJava()
}
wasmJs {
browser {}
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonMain")) }
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcCommonMain")) }
fleet/rhizomedb/gradlebuild/build.gradle.kts
+8 -1
View File
@@ -4,7 +4,6 @@ import fleet.buildtool.jpms.withJavaSourceSet
// IMPORT__MARKER_END
plugins {
alias(libs.plugins.kotlin.multiplatform)
id("fleet.multiplatform-module-conventions")
id("fleet.project-module-conventions")
id("fleet.toolchain-conventions")
id("fleet.module-publishing-conventions")
@@ -31,6 +30,14 @@ kotlin {
"-Xlambdas=class",
"-opt-in=kotlin.concurrent.atomics.ExperimentalAtomicApi",
)
targets {
jvm {
withJava()
}
wasmJs {
browser {}
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonMain")) }
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcCommonMain")) }
fleet/rpc.server/gradlebuild/build.gradle.kts
+8 -1
View File
@@ -4,7 +4,6 @@ import fleet.buildtool.jpms.withJavaSourceSet
// IMPORT__MARKER_END
plugins {
alias(libs.plugins.kotlin.multiplatform)
id("fleet.multiplatform-module-conventions")
id("fleet.project-module-conventions")
id("fleet.toolchain-conventions")
id("fleet.module-publishing-conventions")
@@ -28,6 +27,14 @@ kotlin {
compilerOptions.freeCompilerArgs = listOf(
"-Xlambdas=class",
)
targets {
jvm {
withJava()
}
wasmJs {
browser {}
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonMain")) }
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcCommonMain")) }
fleet/rpc/gradlebuild/build.gradle.kts
+8 -1
View File
@@ -4,7 +4,6 @@ import fleet.buildtool.jpms.withJavaSourceSet
// IMPORT__MARKER_END
plugins {
alias(libs.plugins.kotlin.multiplatform)
id("fleet.multiplatform-module-conventions")
id("fleet.project-module-conventions")
id("fleet.toolchain-conventions")
id("fleet.module-publishing-conventions")
@@ -33,6 +32,14 @@ kotlin {
"-Xlambdas=class",
"-opt-in=kotlin.concurrent.atomics.ExperimentalAtomicApi",
)
targets {
jvm {
withJava()
}
wasmJs {
browser {}
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonMain")) }
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcCommonMain")) }
fleet/util/core/gradlebuild/build.gradle.kts
+8 -1
View File
@@ -6,7 +6,6 @@ plugins {
alias(libs.plugins.kotlin.multiplatform)
id("fleet.project-module-conventions")
id("fleet.toolchain-conventions")
id("fleet.multiplatform-module-conventions")
id("fleet.module-publishing-conventions")
id("fleet.sdk-repositories-publishing-conventions")
id("fleet.open-source-module-conventions")
@@ -33,6 +32,14 @@ kotlin {
"-Xlambdas=class",
"-opt-in=kotlin.concurrent.atomics.ExperimentalAtomicApi",
)
targets {
jvm {
withJava()
}
wasmJs {
browser {}
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmMain")) }
tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcJvmMain")) }
fleet/util/logging/api/gradlebuild/build.gradle.kts
+8 -1
View File
@@ -6,7 +6,6 @@ plugins {
alias(libs.plugins.kotlin.multiplatform)
id("fleet-module")
id("fleet.project-module-conventions")
id("fleet.multiplatform-module-conventions")
id("fleet.toolchain-conventions")
id("fleet.module-publishing-conventions")
id("fleet.sdk-repositories-publishing-conventions")
@@ -31,6 +30,14 @@ kotlin {
compilerOptions.freeCompilerArgs = listOf(
"-Xlambdas=class",
)
targets {
jvm {
withJava()
}
wasmJs {
browser {}
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonMain")) }
tasks.named("syncCommonMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcCommonMain")) }
fleet/util/logging/slf4j/gradlebuild/build.gradle.kts
+5 -4
View File
@@ -29,6 +29,11 @@ kotlin {
compilerOptions.freeCompilerArgs = listOf(
"-Xlambdas=class",
)
targets {
jvm {
withJava()
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmMain")) }
tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { resources.add(layout.projectDirectory.dir("../resourcesJvmMain")) }
@@ -45,13 +50,9 @@ kotlin {
sourceSets.commonTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../testCommonTest")) }
sourceSets.jvmTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../testJvmTest")) }
configureAtMostOneJvmTargetOrThrow { compilations.named("test") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.projectDirectory.dir("../testJvmTest")) } } }
sourceSets.wasmJsMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcWasmJsMain")) }
sourceSets.wasmJsTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../testWasmJsTest")) }
sourceSets.commonMain.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesCommonMain")) }
sourceSets.commonTest.configure { resources.srcDir(layout.projectDirectory.dir("../testResourcesCommonTest")) }
sourceSets.jvmTest.configure { resources.srcDir(layout.projectDirectory.dir("../testResourcesJvmTest")) }
sourceSets.wasmJsMain.configure { resources.srcDir(layout.projectDirectory.dir("../resourcesWasmJsMain")) }
sourceSets.wasmJsTest.configure { resources.srcDir(layout.projectDirectory.dir("../testResourcesWasmJsTest")) }
}
sourceSets.commonMain.dependencies {
implementation(jps.org.jetbrains.kotlin.kotlin.stdlib1993400674.get().let { "${it.group}:${it.name}:${it.version}" }) {
fleet/util/multiplatform/gradlebuild/build.gradle.kts
+8 -1
View File
@@ -11,7 +11,6 @@ plugins {
id("fleet.sdk-repositories-publishing-conventions")
id("fleet.open-source-module-conventions")
id("fleet-build-jps-module-plugin")
id("fleet.multiplatform-module-conventions")
alias(libs.plugins.dokka)
// GRADLE_PLUGINS__MARKER_START
// GRADLE_PLUGINS__MARKER_END
@@ -30,6 +29,14 @@ kotlin {
compilerOptions.freeCompilerArgs = listOf(
"-Xlambdas=class",
)
targets {
jvm {
withJava()
}
wasmJs {
browser {}
}
}
pluginManager.withPlugin("fleet-build-jps-module-plugin") {
tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmMain")) }
tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../src")) }