[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
This commit is contained in:
Titouan Bion
2025-07-24 23:39:17 +00:00
committed by intellij-monorepo-bot
parent 7e7542b60a
commit da90d62b6e
40 changed files with 50 additions and 226 deletions
+1 -1
View File
@@ -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",
-1
View File
@@ -26,7 +26,6 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/srcCommonMain" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/srcJvmMain" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/gradlebuild/build" />
</content>
<orderEntry type="inheritedJdk" />
+3 -4
View File
@@ -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")) }
-22
View File
@@ -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
}
+1 -1
View File
@@ -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"]
)
-1
View File
@@ -19,7 +19,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/srcCommonMain" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/srcJvmMain" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/gradlebuild/build" />
</content>
<orderEntry type="inheritedJdk" />
+3 -4
View File
@@ -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")) }
@@ -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;
}
+1 -1
View File
@@ -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",
-1
View File
@@ -30,7 +30,6 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/srcCommonMain" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/srcJvmMain" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/gradlebuild/build" />
</content>
<orderEntry type="inheritedJdk" />
+3 -4
View File
@@ -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")) }
-17
View File
@@ -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;
}
@@ -1,7 +0,0 @@
module fleet.multiplatform.shims {
requires kotlin.stdlib;
requires kotlinx.coroutines.core;
requires static fleet.util.multiplatform;
exports fleet.multiplatform.shims;
}
@@ -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;
}
+1 -1
View File
@@ -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",
@@ -25,7 +25,6 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/srcCommonMain" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/srcJvmMain" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/gradlebuild/build" />
</content>
<orderEntry type="inheritedJdk" />
@@ -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")) }
@@ -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;
}
@@ -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;
}
@@ -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;
}
+1 -1
View File
@@ -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 = [
-1
View File
@@ -28,7 +28,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/srcCommonMain" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/srcJvmMain" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/gradlebuild/build" />
</content>
<orderEntry type="inheritedJdk" />
+3 -4
View File
@@ -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")) }
-20
View File
@@ -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;
}
+9 -2
View File
@@ -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
+1
View File
@@ -27,6 +27,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/srcJvmMain" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/srcCommonMain" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/gradlebuild/build" />
@@ -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")) } } }
@@ -0,0 +1 @@
fleet.util.async.UncaughtCoroutineExceptionHandler
@@ -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;
}
@@ -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;
}
+10 -1
View File
@@ -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
@@ -19,6 +19,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/resourcesJvmMain" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/srcJvmMain" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/gradlebuild/build" />
@@ -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")) }
@@ -0,0 +1 @@
fleet.util.logging.slf4j.Slf4jKLoggerFactory
@@ -0,0 +1 @@
fleet.util.logging.slf4j.FleetSlf4jServiceProvider
@@ -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;
}
+1 -1
View File
@@ -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"]
)
@@ -19,7 +19,6 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/srcCommonMain" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/gradlebuild/build" />
</content>
@@ -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")) }
@@ -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;
}