From de60121067ba5254141ba9e57f86006010a97cea Mon Sep 17 00:00:00 2001 From: Titouan Bion Date: Tue, 22 Apr 2025 00:03:33 +0200 Subject: [PATCH] [fleet] [FL-33087] Do not set WASMJS source sets if not a KMP module GitOrigin-RevId: b89a4c6dd0f3a879d7a7631deb861c8378dc7c07 --- fleet/andel/gradlebuild/build.gradle.kts | 9 ++++++++- fleet/compiler-plugins/gradlebuild/build.gradle.kts | 9 +++++---- fleet/fastutil/gradlebuild/build.gradle.kts | 9 ++++++++- fleet/kernel/gradlebuild/build.gradle.kts | 9 ++++++++- fleet/multiplatform.shims/gradlebuild/build.gradle.kts | 9 ++++++++- fleet/reporting/api/gradlebuild/build.gradle.kts | 9 ++++++++- fleet/reporting/shared/gradlebuild/build.gradle.kts | 9 ++++++++- fleet/rhizomedb/gradlebuild/build.gradle.kts | 9 ++++++++- fleet/rpc.server/gradlebuild/build.gradle.kts | 9 ++++++++- fleet/rpc/gradlebuild/build.gradle.kts | 9 ++++++++- fleet/util/core/gradlebuild/build.gradle.kts | 9 ++++++++- fleet/util/logging/api/gradlebuild/build.gradle.kts | 9 ++++++++- fleet/util/logging/slf4j/gradlebuild/build.gradle.kts | 9 +++++---- fleet/util/multiplatform/gradlebuild/build.gradle.kts | 9 ++++++++- 14 files changed, 106 insertions(+), 20 deletions(-) diff --git a/fleet/andel/gradlebuild/build.gradle.kts b/fleet/andel/gradlebuild/build.gradle.kts index 845677fc6fa3..257c95d34092 100644 --- a/fleet/andel/gradlebuild/build.gradle.kts +++ b/fleet/andel/gradlebuild/build.gradle.kts @@ -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")) } diff --git a/fleet/compiler-plugins/gradlebuild/build.gradle.kts b/fleet/compiler-plugins/gradlebuild/build.gradle.kts index f995e294153f..ac6abbda119e 100644 --- a/fleet/compiler-plugins/gradlebuild/build.gradle.kts +++ b/fleet/compiler-plugins/gradlebuild/build.gradle.kts @@ -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}" }) { diff --git a/fleet/fastutil/gradlebuild/build.gradle.kts b/fleet/fastutil/gradlebuild/build.gradle.kts index 00a2fc7d13cd..47835a8cd928 100644 --- a/fleet/fastutil/gradlebuild/build.gradle.kts +++ b/fleet/fastutil/gradlebuild/build.gradle.kts @@ -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")) } diff --git a/fleet/kernel/gradlebuild/build.gradle.kts b/fleet/kernel/gradlebuild/build.gradle.kts index 2ff804938809..a9c648d39b39 100644 --- a/fleet/kernel/gradlebuild/build.gradle.kts +++ b/fleet/kernel/gradlebuild/build.gradle.kts @@ -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")) } diff --git a/fleet/multiplatform.shims/gradlebuild/build.gradle.kts b/fleet/multiplatform.shims/gradlebuild/build.gradle.kts index 3309df8ad27a..b2d0a1b549d6 100644 --- a/fleet/multiplatform.shims/gradlebuild/build.gradle.kts +++ b/fleet/multiplatform.shims/gradlebuild/build.gradle.kts @@ -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")) } diff --git a/fleet/reporting/api/gradlebuild/build.gradle.kts b/fleet/reporting/api/gradlebuild/build.gradle.kts index d0d5b6d413f9..732408e2c9eb 100644 --- a/fleet/reporting/api/gradlebuild/build.gradle.kts +++ b/fleet/reporting/api/gradlebuild/build.gradle.kts @@ -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")) } diff --git a/fleet/reporting/shared/gradlebuild/build.gradle.kts b/fleet/reporting/shared/gradlebuild/build.gradle.kts index 5860ed6a6b07..5558302cd737 100644 --- a/fleet/reporting/shared/gradlebuild/build.gradle.kts +++ b/fleet/reporting/shared/gradlebuild/build.gradle.kts @@ -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")) } diff --git a/fleet/rhizomedb/gradlebuild/build.gradle.kts b/fleet/rhizomedb/gradlebuild/build.gradle.kts index eee89425cdd1..f794b44fbc02 100644 --- a/fleet/rhizomedb/gradlebuild/build.gradle.kts +++ b/fleet/rhizomedb/gradlebuild/build.gradle.kts @@ -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")) } diff --git a/fleet/rpc.server/gradlebuild/build.gradle.kts b/fleet/rpc.server/gradlebuild/build.gradle.kts index 20d64a20edc1..1172fe2dc73a 100644 --- a/fleet/rpc.server/gradlebuild/build.gradle.kts +++ b/fleet/rpc.server/gradlebuild/build.gradle.kts @@ -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")) } diff --git a/fleet/rpc/gradlebuild/build.gradle.kts b/fleet/rpc/gradlebuild/build.gradle.kts index 92594999a7dd..106c0f117b9e 100644 --- a/fleet/rpc/gradlebuild/build.gradle.kts +++ b/fleet/rpc/gradlebuild/build.gradle.kts @@ -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")) } diff --git a/fleet/util/core/gradlebuild/build.gradle.kts b/fleet/util/core/gradlebuild/build.gradle.kts index 532b4f51455c..d7c6041d3ec6 100644 --- a/fleet/util/core/gradlebuild/build.gradle.kts +++ b/fleet/util/core/gradlebuild/build.gradle.kts @@ -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")) } diff --git a/fleet/util/logging/api/gradlebuild/build.gradle.kts b/fleet/util/logging/api/gradlebuild/build.gradle.kts index ef8cec204c22..e8725e3f4b0f 100644 --- a/fleet/util/logging/api/gradlebuild/build.gradle.kts +++ b/fleet/util/logging/api/gradlebuild/build.gradle.kts @@ -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")) } diff --git a/fleet/util/logging/slf4j/gradlebuild/build.gradle.kts b/fleet/util/logging/slf4j/gradlebuild/build.gradle.kts index 05f05e79daea..cf427a13fb70 100644 --- a/fleet/util/logging/slf4j/gradlebuild/build.gradle.kts +++ b/fleet/util/logging/slf4j/gradlebuild/build.gradle.kts @@ -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}" }) { diff --git a/fleet/util/multiplatform/gradlebuild/build.gradle.kts b/fleet/util/multiplatform/gradlebuild/build.gradle.kts index 7127487ccfa0..9ff03a49c15d 100644 --- a/fleet/util/multiplatform/gradlebuild/build.gradle.kts +++ b/fleet/util/multiplatform/gradlebuild/build.gradle.kts @@ -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")) }