From da90d62b6ed8e094e212a0b74b8834c3988a4022 Mon Sep 17 00:00:00 2001 From: Titouan Bion Date: Tue, 8 Jul 2025 17:01:45 +0200 Subject: [PATCH] [fleet] [FL-33258] Remove `module-info.java` files # Conflicts: # build/bazel-targets.json # community/fleet/andel/BUILD.bazel # community/fleet/fastutil/BUILD.bazel # community/fleet/kernel/BUILD.bazel # community/fleet/reporting/shared/BUILD.bazel # community/fleet/rpc/BUILD.bazel # fleet/app.fleet/performance/test/kotlin/module-info.java # fleet/boringFormatter.testFramework/src/module-info.java # fleet/common/srcJvmMain/module-info.java # fleet/compose/foundation/BUILD.bazel # fleet/dock/metadata/BUILD.bazel # fleet/editorconfig/BUILD.bazel # fleet/frontend.ui/BUILD.bazel # fleet/intellij/util/text/matching/BUILD.bazel # fleet/jba/BUILD.bazel # fleet/kernel.plugins/BUILD.bazel # fleet/localNavigation/BUILD.bazel # fleet/navigation/common/BUILD.bazel # fleet/navigation/frontend/BUILD.bazel # fleet/noria/windowManagement/api/BUILD.bazel # fleet/plugins/ai/common/src/module-info.java # fleet/plugins/ai/completion/experimental/frontend/BUILD.bazel # fleet/plugins/ai/completion/frontend/BUILD.bazel # fleet/plugins/ai/completion/java/frontend/BUILD.bazel # fleet/plugins/ai/completion/kotlin/frontend/BUILD.bazel # fleet/plugins/ai/completion/python/frontend/BUILD.bazel # fleet/plugins/ai/frontend/src/module-info.java # fleet/plugins/ai/protocol/src/module-info.java # fleet/plugins/authentication/frontend/BUILD.bazel # fleet/plugins/bazel/frontend/BUILD.bazel # fleet/plugins/bazel/frontend/src/module-info.java # fleet/plugins/bazel/integrationTest/BUILD.bazel # fleet/plugins/bazel/integrationTest/src/module-info.java # fleet/plugins/bazel/test/src/module-info.java # fleet/plugins/code/common/BUILD.bazel # fleet/plugins/code/protocol/BUILD.bazel # fleet/plugins/codeVisionCore/frontend/BUILD.bazel # fleet/plugins/codecanvas/frontend/BUILD.bazel # fleet/plugins/codecanvas/frontend/fleet.plugins.codecanvas.frontend.iml # fleet/plugins/codecanvas/frontend/gradlebuild/build.gradle.kts # fleet/plugins/css/frontend/src/module-info.java # fleet/plugins/css/test/test/module-info.java # fleet/plugins/dap/common/BUILD.bazel # fleet/plugins/dap/frontend/BUILD.bazel # fleet/plugins/darkMatter/workspace/src/module-info.java # fleet/plugins/database/common/BUILD.bazel # fleet/plugins/debug/common/BUILD.bazel # fleet/plugins/debug/frontend/BUILD.bazel # fleet/plugins/debug/protocol/BUILD.bazel # fleet/plugins/devkit/protocol/BUILD.bazel # fleet/plugins/devkit/workspace/src/module-info.java # fleet/plugins/diff/frontend/BUILD.bazel # fleet/plugins/filetree/frontend/BUILD.bazel # fleet/plugins/git/common/BUILD.bazel # fleet/plugins/git/frontend/BUILD.bazel # fleet/plugins/git/protocol/BUILD.bazel # fleet/plugins/gradle/common/BUILD.bazel # fleet/plugins/gradle/frontend/BUILD.bazel # fleet/plugins/gradle/protocol/BUILD.bazel # fleet/plugins/imageViewer/frontend/BUILD.bazel # fleet/plugins/intellij/common/BUILD.bazel # fleet/plugins/intellij/frontend/BUILD.bazel # fleet/plugins/intellij/protocol/BUILD.bazel # fleet/plugins/intellij/protocol/srcJvmMain/module-info.java # fleet/plugins/java/common/BUILD.bazel # fleet/plugins/java/frontend/BUILD.bazel # fleet/plugins/java/protocol/BUILD.bazel # fleet/plugins/json/frontend/BUILD.bazel # fleet/plugins/json/parsing/common/BUILD.bazel # fleet/plugins/keymap/frontend/BUILD.bazel # fleet/plugins/keymaps/Eclipse/frontend/BUILD.bazel # fleet/plugins/keymaps/Emacs/frontend/BUILD.bazel # fleet/plugins/keymaps/IJClassic/frontend/BUILD.bazel # fleet/plugins/keymaps/SublimeText/frontend/BUILD.bazel # fleet/plugins/keymaps/VSCode/frontend/BUILD.bazel # fleet/plugins/kotlin/test/test/module-info.java # fleet/plugins/lang/frontend/srcJvmMain/module-info.java # fleet/plugins/licensing/frontend/BUILD.bazel # fleet/plugins/lldb/frontend/BUILD.bazel # fleet/plugins/lldb/protocol/BUILD.bazel # fleet/plugins/localHistory/frontend/BUILD.bazel # fleet/plugins/maven/common/BUILD.bazel # fleet/plugins/maven/frontend/BUILD.bazel # fleet/plugins/maven/protocol/BUILD.bazel # fleet/plugins/misc/common/BUILD.bazel # fleet/plugins/misc/protocol/BUILD.bazel # fleet/plugins/mlSorting/frontend/src/module-info.java # fleet/plugins/navigationBar/frontend/BUILD.bazel # fleet/plugins/reporting/fahrplan/ui/frontend/BUILD.bazel # fleet/plugins/run/engine/common/BUILD.bazel # fleet/plugins/run/engine/frontend/BUILD.bazel # fleet/plugins/run/engine/protocol/BUILD.bazel # fleet/plugins/run/engine/workspace/BUILD.bazel # fleet/plugins/run/pty/common/BUILD.bazel # fleet/plugins/run/pty/frontend/BUILD.bazel # fleet/plugins/run/pty/protocol/BUILD.bazel # fleet/plugins/run/tasks/common/BUILD.bazel # fleet/plugins/run/tasks/frontend/BUILD.bazel # fleet/plugins/run/tasks/protocol/BUILD.bazel # fleet/plugins/run/tasks/pty/common/BUILD.bazel # fleet/plugins/run/tasks/pty/frontend/BUILD.bazel # fleet/plugins/run/terminal/common/BUILD.bazel # fleet/plugins/run/terminal/frontend/BUILD.bazel # fleet/plugins/schema/frontend/BUILD.bazel # fleet/plugins/settings/common/BUILD.bazel # fleet/plugins/settings/frontend/BUILD.bazel # fleet/plugins/smartMode/common/BUILD.bazel # fleet/plugins/smartMode/frontend/BUILD.bazel # fleet/plugins/smartMode/protocol/BUILD.bazel # fleet/plugins/sshAgent/common/BUILD.bazel # fleet/plugins/sshAgent/frontend/BUILD.bazel # fleet/plugins/stickyLinesView/frontend/BUILD.bazel # fleet/plugins/syntax/common/BUILD.bazel # fleet/plugins/syntax/frontend/BUILD.bazel # fleet/plugins/teamcity/common/BUILD.bazel # fleet/plugins/teamcity/frontend/BUILD.bazel # fleet/plugins/teamcity/protocol/BUILD.bazel # fleet/plugins/terraform/common/BUILD.bazel # fleet/plugins/terraform/frontend/BUILD.bazel # fleet/plugins/terraform/protocol/BUILD.bazel # fleet/plugins/themeDesigner/frontend/BUILD.bazel # fleet/plugins/toolchain/common/BUILD.bazel # fleet/plugins/toolchain/frontend/BUILD.bazel # fleet/plugins/toolchain/protocol/BUILD.bazel # fleet/rpc.ktor.client/BUILD.bazel # fleet/rpc.ktor/BUILD.bazel # fleet/rpc.relay/srcJvmMain/module-info.java # fleet/schema/protocol/BUILD.bazel # fleet/supervisor/srcJvmMain/module-info.java # fleet/test.framework/src/main/kotlin/module-info.java # fleet/testlib/src/module-info.java (cherry picked from commit a15b1b8db00762334185d71812501b85b3da1d88) FLEET-MR-6453 GitOrigin-RevId: d8a6176bb62d75e7cb8fec0c8434d3166dc37e81 --- fleet/andel/BUILD.bazel | 2 +- fleet/andel/fleet.andel.iml | 1 - fleet/andel/gradlebuild/build.gradle.kts | 7 ++--- fleet/andel/srcJvmMain/module-info.java | 22 -------------- fleet/fastutil/BUILD.bazel | 2 +- fleet/fastutil/fleet.fastutil.iml | 1 - fleet/fastutil/gradlebuild/build.gradle.kts | 7 ++--- fleet/fastutil/srcJvmMain/module-info.java | 8 ----- fleet/kernel/BUILD.bazel | 2 +- fleet/kernel/fleet.kernel.iml | 1 - fleet/kernel/gradlebuild/build.gradle.kts | 7 ++--- fleet/kernel/srcJvmMain/module-info.java | 17 ----------- .../srcJvmMain/module-info.java | 7 ----- .../reporting/api/srcJvmMain/module-info.java | 10 ------- fleet/reporting/shared/BUILD.bazel | 2 +- .../shared/fleet.reporting.shared.iml | 1 - .../shared/gradlebuild/build.gradle.kts | 7 ++--- .../shared/srcJvmMain/module-info.java | 12 -------- fleet/rhizomedb/srcJvmMain/module-info.java | 13 -------- fleet/rpc.server/srcJvmMain/module-info.java | 14 --------- fleet/rpc/BUILD.bazel | 2 +- fleet/rpc/fleet.rpc.iml | 1 - fleet/rpc/gradlebuild/build.gradle.kts | 7 ++--- fleet/rpc/srcJvmMain/module-info.java | 20 ------------- fleet/util/core/BUILD.bazel | 11 +++++-- fleet/util/core/fleet.util.core.iml | 1 + fleet/util/core/gradlebuild/build.gradle.kts | 2 ++ ...tlinx.coroutines.CoroutineExceptionHandler | 1 + fleet/util/core/srcJvmMain/module-info.java | 30 ------------------- .../logging/api/srcJvmMain/module-info.java | 10 ------- fleet/util/logging/slf4j/BUILD.bazel | 11 ++++++- .../slf4j/fleet.util.logging.slf4j.iml | 1 + .../slf4j/gradlebuild/build.gradle.kts | 2 ++ .../fleet.util.logging.KLoggerFactory | 1 + .../org.slf4j.spi.SLF4JServiceProvider | 1 + .../logging/slf4j/srcJvmMain/module-info.java | 18 ----------- fleet/util/multiplatform/BUILD.bazel | 2 +- .../fleet.util.multiplatform.iml | 1 - .../gradlebuild/build.gradle.kts | 5 +--- fleet/util/multiplatform/src/module-info.java | 6 ---- 40 files changed, 50 insertions(+), 226 deletions(-) delete mode 100644 fleet/andel/srcJvmMain/module-info.java delete mode 100644 fleet/fastutil/srcJvmMain/module-info.java delete mode 100644 fleet/kernel/srcJvmMain/module-info.java delete mode 100644 fleet/multiplatform.shims/srcJvmMain/module-info.java delete mode 100644 fleet/reporting/api/srcJvmMain/module-info.java delete mode 100644 fleet/reporting/shared/srcJvmMain/module-info.java delete mode 100644 fleet/rhizomedb/srcJvmMain/module-info.java delete mode 100644 fleet/rpc.server/srcJvmMain/module-info.java delete mode 100644 fleet/rpc/srcJvmMain/module-info.java create mode 100644 fleet/util/core/resources/META-INF/services/kotlinx.coroutines.CoroutineExceptionHandler delete mode 100644 fleet/util/core/srcJvmMain/module-info.java delete mode 100644 fleet/util/logging/api/srcJvmMain/module-info.java create mode 100644 fleet/util/logging/slf4j/resources/META-INF/services/fleet.util.logging.KLoggerFactory create mode 100644 fleet/util/logging/slf4j/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider delete mode 100644 fleet/util/logging/slf4j/srcJvmMain/module-info.java delete mode 100644 fleet/util/multiplatform/src/module-info.java diff --git a/fleet/andel/BUILD.bazel b/fleet/andel/BUILD.bazel index 3b03a4204836..bad75765c8d1 100644 --- a/fleet/andel/BUILD.bazel +++ b/fleet/andel/BUILD.bazel @@ -11,7 +11,7 @@ jvm_library( name = "andel", module_name = "fleet.andel", visibility = ["//visibility:public"], - srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java", "srcJvmMain/**/*.kt", "srcJvmMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), + srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), kotlinc_opts = ":custom_andel", deps = [ "@lib//:kotlin-stdlib", diff --git a/fleet/andel/fleet.andel.iml b/fleet/andel/fleet.andel.iml index 354faea0fb6b..f95485daf562 100644 --- a/fleet/andel/fleet.andel.iml +++ b/fleet/andel/fleet.andel.iml @@ -26,7 +26,6 @@ - diff --git a/fleet/andel/gradlebuild/build.gradle.kts b/fleet/andel/gradlebuild/build.gradle.kts index 081df317647d..a25884854ed5 100644 --- a/fleet/andel/gradlebuild/build.gradle.kts +++ b/fleet/andel/gradlebuild/build.gradle.kts @@ -40,15 +40,14 @@ kotlin { 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")) } sourceSets.commonMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/commonMain/kotlin")) } - 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")) } - sourceSets.jvmMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/kotlin")) } - configureAtMostOneJvmTargetOrThrow { compilations.named("main") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/java")) } } } tasks.named("syncCommonTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonTest")) } + tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmMain")) } tasks.named("syncJvmTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmTest")) } tasks.named("syncWasmJsMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/wasmJsMain")) } tasks.named("syncWasmJsTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/wasmJsTest")) } sourceSets.commonTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../testCommonTest")) } + sourceSets.jvmMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcJvmMain")) } + 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")) } diff --git a/fleet/andel/srcJvmMain/module-info.java b/fleet/andel/srcJvmMain/module-info.java deleted file mode 100644 index 82ce12d69629..000000000000 --- a/fleet/andel/srcJvmMain/module-info.java +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -module fleet.andel { - requires kotlin.stdlib; - requires org.jetbrains.annotations; - requires fleet.util.core; - requires kotlinx.serialization.core; - requires kotlinx.serialization.json; - requires kotlinx.collections.immutable.jvm; - requires it.unimi.dsi.fastutil; - - exports andel.editor; - exports andel.intervals; - exports andel.lines; - exports andel.operation; - exports andel.text; - exports andel.rope; - exports andel.tokens; - exports andel.undo; - exports andel.util; - - opens andel.intervals.impl; // opens for testing. clojure loads into unnamed module, can't explicitly name it here -} \ No newline at end of file diff --git a/fleet/fastutil/BUILD.bazel b/fleet/fastutil/BUILD.bazel index ab3e5b1f639e..18facb3c54f1 100644 --- a/fleet/fastutil/BUILD.bazel +++ b/fleet/fastutil/BUILD.bazel @@ -14,7 +14,7 @@ jvm_library( name = "fastutil", module_name = "fleet.fastutil", visibility = ["//visibility:public"], - srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java", "srcJvmMain/**/*.kt", "srcJvmMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), + srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), kotlinc_opts = ":custom_fastutil", deps = ["@lib//:kotlin-stdlib"] ) diff --git a/fleet/fastutil/fleet.fastutil.iml b/fleet/fastutil/fleet.fastutil.iml index 28b51997a191..46018aabbf3d 100644 --- a/fleet/fastutil/fleet.fastutil.iml +++ b/fleet/fastutil/fleet.fastutil.iml @@ -19,7 +19,6 @@ - diff --git a/fleet/fastutil/gradlebuild/build.gradle.kts b/fleet/fastutil/gradlebuild/build.gradle.kts index 15d674c8de8f..97455717af7f 100644 --- a/fleet/fastutil/gradlebuild/build.gradle.kts +++ b/fleet/fastutil/gradlebuild/build.gradle.kts @@ -39,15 +39,14 @@ kotlin { 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")) } sourceSets.commonMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/commonMain/kotlin")) } - 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")) } - sourceSets.jvmMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/kotlin")) } - configureAtMostOneJvmTargetOrThrow { compilations.named("main") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/java")) } } } tasks.named("syncCommonTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonTest")) } + tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmMain")) } tasks.named("syncJvmTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmTest")) } tasks.named("syncWasmJsMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/wasmJsMain")) } tasks.named("syncWasmJsTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/wasmJsTest")) } sourceSets.commonTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../testCommonTest")) } + sourceSets.jvmMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcJvmMain")) } + 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")) } diff --git a/fleet/fastutil/srcJvmMain/module-info.java b/fleet/fastutil/srcJvmMain/module-info.java deleted file mode 100644 index df95eaf4df33..000000000000 --- a/fleet/fastutil/srcJvmMain/module-info.java +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -module fleet.fastutil { - requires kotlin.stdlib; - - exports fleet.fastutil; - exports fleet.fastutil.ints; - exports fleet.fastutil.longs; -} \ No newline at end of file diff --git a/fleet/kernel/BUILD.bazel b/fleet/kernel/BUILD.bazel index bd1bc01f9ee2..2f9db462dca7 100644 --- a/fleet/kernel/BUILD.bazel +++ b/fleet/kernel/BUILD.bazel @@ -15,7 +15,7 @@ jvm_library( name = "kernel", module_name = "fleet.kernel", visibility = ["//visibility:public"], - srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java", "srcJvmMain/**/*.kt", "srcJvmMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), + srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), kotlinc_opts = ":custom_kernel", deps = [ "@lib//:kotlin-stdlib", diff --git a/fleet/kernel/fleet.kernel.iml b/fleet/kernel/fleet.kernel.iml index e537547ff155..22fac690f632 100644 --- a/fleet/kernel/fleet.kernel.iml +++ b/fleet/kernel/fleet.kernel.iml @@ -30,7 +30,6 @@ - diff --git a/fleet/kernel/gradlebuild/build.gradle.kts b/fleet/kernel/gradlebuild/build.gradle.kts index 2a000f973007..ddfbddab8efc 100644 --- a/fleet/kernel/gradlebuild/build.gradle.kts +++ b/fleet/kernel/gradlebuild/build.gradle.kts @@ -43,15 +43,14 @@ kotlin { 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")) } sourceSets.commonMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/commonMain/kotlin")) } - 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")) } - sourceSets.jvmMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/kotlin")) } - configureAtMostOneJvmTargetOrThrow { compilations.named("main") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/java")) } } } tasks.named("syncCommonTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonTest")) } + tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmMain")) } tasks.named("syncJvmTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmTest")) } tasks.named("syncWasmJsMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/wasmJsMain")) } tasks.named("syncWasmJsTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/wasmJsTest")) } sourceSets.commonTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../testCommonTest")) } + sourceSets.jvmMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcJvmMain")) } + 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")) } diff --git a/fleet/kernel/srcJvmMain/module-info.java b/fleet/kernel/srcJvmMain/module-info.java deleted file mode 100644 index 311cda5c0fb9..000000000000 --- a/fleet/kernel/srcJvmMain/module-info.java +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -module fleet.kernel { - requires transitive kotlin.stdlib; - requires transitive fleet.rhizomedb; - requires transitive kotlinx.serialization.core; - requires transitive kotlinx.serialization.json; - requires transitive fleet.util.core; - requires transitive fleet.rpc; - requires kotlinx.coroutines.core; - requires fleet.reporting.api; - requires fleet.reporting.shared; - requires fleet.multiplatform.shims; - - exports fleet.kernel; - exports fleet.kernel.rebase; - exports fleet.kernel.rete; -} \ No newline at end of file diff --git a/fleet/multiplatform.shims/srcJvmMain/module-info.java b/fleet/multiplatform.shims/srcJvmMain/module-info.java deleted file mode 100644 index d659d99ea174..000000000000 --- a/fleet/multiplatform.shims/srcJvmMain/module-info.java +++ /dev/null @@ -1,7 +0,0 @@ -module fleet.multiplatform.shims { - requires kotlin.stdlib; - requires kotlinx.coroutines.core; - requires static fleet.util.multiplatform; - - exports fleet.multiplatform.shims; -} \ No newline at end of file diff --git a/fleet/reporting/api/srcJvmMain/module-info.java b/fleet/reporting/api/srcJvmMain/module-info.java deleted file mode 100644 index aced29e136d2..000000000000 --- a/fleet/reporting/api/srcJvmMain/module-info.java +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -module fleet.reporting.api { - requires kotlin.stdlib; - requires kotlinx.coroutines.core; - requires io.opentelemetry.api; - requires io.opentelemetry.context; - - exports fleet.tracing; - exports fleet.tracing.runtime; -} \ No newline at end of file diff --git a/fleet/reporting/shared/BUILD.bazel b/fleet/reporting/shared/BUILD.bazel index f94c17f4e048..4d42d44246bc 100644 --- a/fleet/reporting/shared/BUILD.bazel +++ b/fleet/reporting/shared/BUILD.bazel @@ -11,7 +11,7 @@ jvm_library( name = "shared", module_name = "fleet.reporting.shared", visibility = ["//visibility:public"], - srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java", "srcJvmMain/**/*.kt", "srcJvmMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), + srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), kotlinc_opts = ":custom_shared", deps = [ "@lib//:kotlin-stdlib", diff --git a/fleet/reporting/shared/fleet.reporting.shared.iml b/fleet/reporting/shared/fleet.reporting.shared.iml index 19243ad78ca5..24cbcd918cba 100644 --- a/fleet/reporting/shared/fleet.reporting.shared.iml +++ b/fleet/reporting/shared/fleet.reporting.shared.iml @@ -25,7 +25,6 @@ - diff --git a/fleet/reporting/shared/gradlebuild/build.gradle.kts b/fleet/reporting/shared/gradlebuild/build.gradle.kts index c427148bf386..906542c9b07e 100644 --- a/fleet/reporting/shared/gradlebuild/build.gradle.kts +++ b/fleet/reporting/shared/gradlebuild/build.gradle.kts @@ -40,15 +40,14 @@ kotlin { 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")) } sourceSets.commonMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/commonMain/kotlin")) } - 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")) } - sourceSets.jvmMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/kotlin")) } - configureAtMostOneJvmTargetOrThrow { compilations.named("main") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/java")) } } } tasks.named("syncCommonTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonTest")) } + tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmMain")) } tasks.named("syncJvmTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmTest")) } tasks.named("syncWasmJsMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/wasmJsMain")) } tasks.named("syncWasmJsTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/wasmJsTest")) } sourceSets.commonTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../testCommonTest")) } + sourceSets.jvmMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcJvmMain")) } + 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")) } diff --git a/fleet/reporting/shared/srcJvmMain/module-info.java b/fleet/reporting/shared/srcJvmMain/module-info.java deleted file mode 100644 index 38bfd69b41cc..000000000000 --- a/fleet/reporting/shared/srcJvmMain/module-info.java +++ /dev/null @@ -1,12 +0,0 @@ -module fleet.reporting.shared { - requires fleet.reporting.api; - requires kotlin.stdlib; - requires kotlinx.coroutines.core; - requires kotlinx.serialization.json; - requires kotlinx.serialization.core; - requires fleet.multiplatform.shims; - - exports fleet.reporting.shared.fahrplan; - exports fleet.reporting.shared.tracing; - exports fleet.reporting.shared.runtime; -} \ No newline at end of file diff --git a/fleet/rhizomedb/srcJvmMain/module-info.java b/fleet/rhizomedb/srcJvmMain/module-info.java deleted file mode 100644 index 1ad1a8f9455a..000000000000 --- a/fleet/rhizomedb/srcJvmMain/module-info.java +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -module fleet.rhizomedb { - requires fleet.util.core; - requires kotlin.stdlib; - requires kotlinx.collections.immutable.jvm; - requires transitive kotlinx.serialization.core; - requires fleet.multiplatform.shims; - requires kotlinx.serialization.json; - requires org.jetbrains.annotations; - exports com.jetbrains.rhizomedb; - exports com.jetbrains.rhizomedb.impl; - exports com.jetbrains.rhizomedb.rql; -} \ No newline at end of file diff --git a/fleet/rpc.server/srcJvmMain/module-info.java b/fleet/rpc.server/srcJvmMain/module-info.java deleted file mode 100644 index 309888cee0fb..000000000000 --- a/fleet/rpc.server/srcJvmMain/module-info.java +++ /dev/null @@ -1,14 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -module fleet.rpc.server { - requires fleet.rpc; - requires kotlin.stdlib; - requires kotlinx.coroutines.core; - requires kotlinx.serialization.json; - requires fleet.util.core; - requires io.opentelemetry.api; - requires fleet.multiplatform.shims; - requires io.opentelemetry.context; - requires fleet.reporting.api; - requires fleet.reporting.shared; - exports fleet.rpc.server; -} \ No newline at end of file diff --git a/fleet/rpc/BUILD.bazel b/fleet/rpc/BUILD.bazel index 4ed677e416ce..591071ff69d2 100644 --- a/fleet/rpc/BUILD.bazel +++ b/fleet/rpc/BUILD.bazel @@ -15,7 +15,7 @@ jvm_library( name = "rpc", module_name = "fleet.rpc", visibility = ["//visibility:public"], - srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java", "srcJvmMain/**/*.kt", "srcJvmMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), + srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), kotlinc_opts = ":custom_rpc", exported_compiler_plugins = ["@lib//:rpc-plugin"], deps = [ diff --git a/fleet/rpc/fleet.rpc.iml b/fleet/rpc/fleet.rpc.iml index 2b3d404b05cf..9c75f5dcdbb6 100644 --- a/fleet/rpc/fleet.rpc.iml +++ b/fleet/rpc/fleet.rpc.iml @@ -28,7 +28,6 @@ - diff --git a/fleet/rpc/gradlebuild/build.gradle.kts b/fleet/rpc/gradlebuild/build.gradle.kts index 4ba4571d40f4..841d7fef2596 100644 --- a/fleet/rpc/gradlebuild/build.gradle.kts +++ b/fleet/rpc/gradlebuild/build.gradle.kts @@ -42,15 +42,14 @@ kotlin { 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")) } sourceSets.commonMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/commonMain/kotlin")) } - 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")) } - sourceSets.jvmMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/kotlin")) } - configureAtMostOneJvmTargetOrThrow { compilations.named("main") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/java")) } } } tasks.named("syncCommonTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonTest")) } + tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmMain")) } tasks.named("syncJvmTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmTest")) } tasks.named("syncWasmJsMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/wasmJsMain")) } tasks.named("syncWasmJsTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/wasmJsTest")) } sourceSets.commonTest.configure { kotlin.srcDir(layout.projectDirectory.dir("../testCommonTest")) } + sourceSets.jvmMain.configure { kotlin.srcDir(layout.projectDirectory.dir("../srcJvmMain")) } + 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")) } diff --git a/fleet/rpc/srcJvmMain/module-info.java b/fleet/rpc/srcJvmMain/module-info.java deleted file mode 100644 index d682565e57e1..000000000000 --- a/fleet/rpc/srcJvmMain/module-info.java +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -module fleet.rpc { - requires fleet.util.core; - requires kotlinx.serialization.core; - requires kotlinx.serialization.json; - requires kotlin.stdlib; - requires kotlinx.coroutines.core; - requires java.net.http; - requires org.jetbrains.annotations; - requires fleet.reporting.api; - requires fleet.reporting.shared; - requires fleet.multiplatform.shims; - requires kotlinx.datetime; - - exports fleet.rpc; - exports fleet.rpc.core; - exports fleet.rpc.core.util; - exports fleet.rpc.client; - exports fleet.rpc.client.proxy; -} \ No newline at end of file diff --git a/fleet/util/core/BUILD.bazel b/fleet/util/core/BUILD.bazel index 0950773c29f1..37e467ff7b94 100644 --- a/fleet/util/core/BUILD.bazel +++ b/fleet/util/core/BUILD.bazel @@ -1,12 +1,18 @@ ### auto-generated section `build fleet.util.core` start load("//build:compiler-options.bzl", "create_kotlinc_options") -load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_provided_library") +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_provided_library", "jvm_resources") create_kotlinc_options( name = "custom_core", opt_in = ["kotlin.concurrent.atomics.ExperimentalAtomicApi"] ) +jvm_resources( + name = "core_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + jvm_provided_library( name = "multiplatform_provided", lib = "//fleet/util/multiplatform" @@ -38,6 +44,7 @@ jvm_library( "@lib//:kotlinx-collections-immutable", "//fleet/multiplatform.shims", "//fleet/fastutil", - ] + ], + runtime_deps = [":core_resources"] ) ### auto-generated section `build fleet.util.core` end \ No newline at end of file diff --git a/fleet/util/core/fleet.util.core.iml b/fleet/util/core/fleet.util.core.iml index a2b6e9538222..06f5660f900f 100644 --- a/fleet/util/core/fleet.util.core.iml +++ b/fleet/util/core/fleet.util.core.iml @@ -27,6 +27,7 @@ + diff --git a/fleet/util/core/gradlebuild/build.gradle.kts b/fleet/util/core/gradlebuild/build.gradle.kts index 17d723190e8f..8102331d942c 100644 --- a/fleet/util/core/gradlebuild/build.gradle.kts +++ b/fleet/util/core/gradlebuild/build.gradle.kts @@ -40,6 +40,8 @@ kotlin { } 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("../resources")) } + sourceSets.jvmMain.configure { resources.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/resources")) } tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcJvmMain")) } sourceSets.jvmMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/kotlin")) } configureAtMostOneJvmTargetOrThrow { compilations.named("main") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/java")) } } } diff --git a/fleet/util/core/resources/META-INF/services/kotlinx.coroutines.CoroutineExceptionHandler b/fleet/util/core/resources/META-INF/services/kotlinx.coroutines.CoroutineExceptionHandler new file mode 100644 index 000000000000..18338127662a --- /dev/null +++ b/fleet/util/core/resources/META-INF/services/kotlinx.coroutines.CoroutineExceptionHandler @@ -0,0 +1 @@ +fleet.util.async.UncaughtCoroutineExceptionHandler \ No newline at end of file diff --git a/fleet/util/core/srcJvmMain/module-info.java b/fleet/util/core/srcJvmMain/module-info.java deleted file mode 100644 index 726f641c795e..000000000000 --- a/fleet/util/core/srcJvmMain/module-info.java +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -module fleet.util.core { - exports fleet.util; - exports fleet.util.async; - exports fleet.util.bifurcan; - exports fleet.util.channels; - exports fleet.util.openmap; - exports fleet.util.radixTrie; - exports fleet.util.reducible; - exports fleet.util.serialization; - exports fleet.util.text; - exports fleet.util.tree; - - requires kotlin.stdlib; - requires kotlinx.coroutines.core; - requires java.management; - requires transitive kotlinx.collections.immutable.jvm; - requires transitive fleet.util.logging.api; - requires transitive fleet.fastutil; - requires transitive fleet.multiplatform.shims; - requires kotlinx.serialization.core; - requires kotlinx.serialization.json; - requires fleet.reporting.shared; - requires kotlinx.datetime; - requires fleet.reporting.api; - requires static fleet.util.multiplatform; - requires kotlin.codepoints.jvm; - - provides kotlinx.coroutines.CoroutineExceptionHandler with fleet.util.async.UncaughtCoroutineExceptionHandler; -} diff --git a/fleet/util/logging/api/srcJvmMain/module-info.java b/fleet/util/logging/api/srcJvmMain/module-info.java deleted file mode 100644 index 336500ea85f8..000000000000 --- a/fleet/util/logging/api/srcJvmMain/module-info.java +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -module fleet.util.logging.api { - exports fleet.util.logging; - - requires transitive kotlin.stdlib; - requires transitive kotlinx.coroutines.core; - requires static fleet.util.multiplatform; - - uses fleet.util.logging.KLoggerFactory; -} \ No newline at end of file diff --git a/fleet/util/logging/slf4j/BUILD.bazel b/fleet/util/logging/slf4j/BUILD.bazel index d32990645c47..ad6e24a33d6e 100644 --- a/fleet/util/logging/slf4j/BUILD.bazel +++ b/fleet/util/logging/slf4j/BUILD.bazel @@ -3,6 +3,12 @@ load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") jvm_resources( name = "slf4j_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_resources( + name = "slf4j_resources_1", files = glob(["resourcesJvmMain/**/*"]), strip_prefix = "resourcesJvmMain" ) @@ -18,6 +24,9 @@ jvm_library( "//fleet/util/logging/api", ], exports = ["@lib//:slf4j-api"], - runtime_deps = [":slf4j_resources"] + runtime_deps = [ + ":slf4j_resources", + ":slf4j_resources_1", + ] ) ### auto-generated section `build fleet.util.logging.slf4j` end \ No newline at end of file diff --git a/fleet/util/logging/slf4j/fleet.util.logging.slf4j.iml b/fleet/util/logging/slf4j/fleet.util.logging.slf4j.iml index ff5af5e14843..07d774b3b360 100644 --- a/fleet/util/logging/slf4j/fleet.util.logging.slf4j.iml +++ b/fleet/util/logging/slf4j/fleet.util.logging.slf4j.iml @@ -19,6 +19,7 @@ + diff --git a/fleet/util/logging/slf4j/gradlebuild/build.gradle.kts b/fleet/util/logging/slf4j/gradlebuild/build.gradle.kts index 2f322d1db33e..24016b2f1a97 100644 --- a/fleet/util/logging/slf4j/gradlebuild/build.gradle.kts +++ b/fleet/util/logging/slf4j/gradlebuild/build.gradle.kts @@ -34,6 +34,8 @@ kotlin { jvm {} 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("../resources")) } + sourceSets.jvmMain.configure { resources.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/resources")) } tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { resources.add(layout.projectDirectory.dir("../resourcesJvmMain")) } sourceSets.jvmMain.configure { resources.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/resources")) } tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { sources.add(layout.projectDirectory.dir("../srcJvmMain")) } diff --git a/fleet/util/logging/slf4j/resources/META-INF/services/fleet.util.logging.KLoggerFactory b/fleet/util/logging/slf4j/resources/META-INF/services/fleet.util.logging.KLoggerFactory new file mode 100644 index 000000000000..756d92c041eb --- /dev/null +++ b/fleet/util/logging/slf4j/resources/META-INF/services/fleet.util.logging.KLoggerFactory @@ -0,0 +1 @@ +fleet.util.logging.slf4j.Slf4jKLoggerFactory \ No newline at end of file diff --git a/fleet/util/logging/slf4j/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider b/fleet/util/logging/slf4j/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider new file mode 100644 index 000000000000..0815da47239d --- /dev/null +++ b/fleet/util/logging/slf4j/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider @@ -0,0 +1 @@ +fleet.util.logging.slf4j.FleetSlf4jServiceProvider \ No newline at end of file diff --git a/fleet/util/logging/slf4j/srcJvmMain/module-info.java b/fleet/util/logging/slf4j/srcJvmMain/module-info.java deleted file mode 100644 index ac5df137aa8e..000000000000 --- a/fleet/util/logging/slf4j/srcJvmMain/module-info.java +++ /dev/null @@ -1,18 +0,0 @@ -import fleet.util.logging.KLoggerFactory; -import fleet.util.logging.slf4j.FleetSlf4jServiceProvider; -import fleet.util.logging.slf4j.Slf4jKLoggerFactory; -import org.slf4j.spi.SLF4JServiceProvider; - -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -module fleet.util.logging.slf4j { - exports fleet.util.logging.slf4j; - - requires kotlin.stdlib; - requires transitive org.slf4j; - requires fleet.util.logging.api; - - provides KLoggerFactory with Slf4jKLoggerFactory; - provides SLF4JServiceProvider with FleetSlf4jServiceProvider; - uses SLF4JServiceProvider; - uses KLoggerFactory; -} \ No newline at end of file diff --git a/fleet/util/multiplatform/BUILD.bazel b/fleet/util/multiplatform/BUILD.bazel index 6666e09f1843..0245825f00d2 100644 --- a/fleet/util/multiplatform/BUILD.bazel +++ b/fleet/util/multiplatform/BUILD.bazel @@ -5,7 +5,7 @@ jvm_library( name = "multiplatform", module_name = "fleet.util.multiplatform", visibility = ["//visibility:public"], - srcs = glob(["src/**/*.kt", "src/**/*.java", "srcCommonMain/**/*.kt", "srcCommonMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), + srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), exported_compiler_plugins = ["@lib//:expects-plugin"], deps = ["@lib//:kotlin-stdlib"] ) diff --git a/fleet/util/multiplatform/fleet.util.multiplatform.iml b/fleet/util/multiplatform/fleet.util.multiplatform.iml index d7b55336a16a..ebca4ee1952a 100644 --- a/fleet/util/multiplatform/fleet.util.multiplatform.iml +++ b/fleet/util/multiplatform/fleet.util.multiplatform.iml @@ -19,7 +19,6 @@ - diff --git a/fleet/util/multiplatform/gradlebuild/build.gradle.kts b/fleet/util/multiplatform/gradlebuild/build.gradle.kts index 4fe38d64a213..c6907284c601 100644 --- a/fleet/util/multiplatform/gradlebuild/build.gradle.kts +++ b/fleet/util/multiplatform/gradlebuild/build.gradle.kts @@ -36,14 +36,11 @@ kotlin { 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")) } - sourceSets.jvmMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/kotlin")) } - configureAtMostOneJvmTargetOrThrow { compilations.named("main") { withJavaSourceSet { javaSourceSet -> javaSourceSet.java.srcDir(layout.buildDirectory.dir("copiedSources/jvmMain/java")) } } } 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")) } sourceSets.commonMain.configure { kotlin.srcDir(layout.buildDirectory.dir("copiedSources/commonMain/kotlin")) } tasks.named("syncCommonTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/commonTest")) } + tasks.named("syncJvmMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmMain")) } tasks.named("syncJvmTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/jvmTest")) } tasks.named("syncWasmJsMainJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/wasmJsMain")) } tasks.named("syncWasmJsTestJpsSources", fleet.buildtool.jps.module.plugin.SyncJpsSourcesTask::class.java) { destinationDirectory.set(layout.buildDirectory.dir("copiedSources/wasmJsTest")) } diff --git a/fleet/util/multiplatform/src/module-info.java b/fleet/util/multiplatform/src/module-info.java deleted file mode 100644 index 2b3ea5174965..000000000000 --- a/fleet/util/multiplatform/src/module-info.java +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -module fleet.util.multiplatform { - exports fleet.util.multiplatform; - - requires kotlin.stdlib; -}