From 2db9ad8ef6cae1f5651d9b24b8d78a4f1d935a80 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 17 Feb 2025 06:52:52 +0100 Subject: [PATCH] update bazel files GitOrigin-RevId: 5bf54290c411048009614bacceeb742a53d5c0a4 --- fleet/rpc/BUILD.bazel | 1 + fleet/util/core/BUILD.bazel | 3 +- java/debugger/backend/BUILD.bazel | 29 +++++++++++++++++ java/debugger/frontend/BUILD.bazel | 30 +++++++++++++++++ java/debugger/shared/BUILD.bazel | 5 +++ java/java-frontback-tests/BUILD.bazel | 2 +- java/plugin/BUILD.bazel | 2 ++ java/testFramework/BUILD.bazel | 2 ++ java/testFramework/shared/BUILD.bazel | 26 +++++++++++++++ lib/BUILD.bazel | 8 ++--- lib/MODULE.bazel | 32 +++++++++---------- plugins/gitlab/gitlab-core/BUILD.bazel | 2 -- .../intentions-shared/BUILD.bazel | 1 + plugins/markdown/test/BUILD.bazel | 1 + xml/xml-frontback-impl/BUILD.bazel | 1 + 15 files changed, 121 insertions(+), 24 deletions(-) create mode 100644 java/debugger/backend/BUILD.bazel create mode 100644 java/debugger/frontend/BUILD.bazel create mode 100644 java/testFramework/shared/BUILD.bazel diff --git a/fleet/rpc/BUILD.bazel b/fleet/rpc/BUILD.bazel index 03825391cad4..7f41de10a9fa 100644 --- a/fleet/rpc/BUILD.bazel +++ b/fleet/rpc/BUILD.bazel @@ -28,6 +28,7 @@ jvm_library( "@lib//:jetbrains-annotations", "@lib//:kotlinx-coroutines-slf4j", "@lib//:kotlinx-coroutines-core", + "@lib//:kotlinx-datetime-jvm", "//fleet/util/core:fleet-util-core", "@lib//:opentelemetry", "@lib//:opentelemetry-semconv", diff --git a/fleet/util/core/BUILD.bazel b/fleet/util/core/BUILD.bazel index 2b0d8a58e995..f8ad0491a456 100644 --- a/fleet/util/core/BUILD.bazel +++ b/fleet/util/core/BUILD.bazel @@ -5,7 +5,7 @@ jvm_library( name = "fleet-util-core", module_name = "fleet.util.core", visibility = ["//visibility:public"], - srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), + srcs = glob(["src/**/*.kt", "src/**/*.java", "srcCommonMain/**/*.kt", "srcCommonMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), deps = [ "@lib//:kotlin-stdlib", "@lib//:kotlinx-coroutines-core", @@ -21,6 +21,7 @@ jvm_library( "//fleet/fastutil", "@lib//:slf4j-api", "@lib//:kotlinx-datetime-jvm", + "//fleet/util/multiplatform:fleet-util-multiplatform", ], exports = [ "//fleet/util/logging/api:fleet-util-logging-api", diff --git a/java/debugger/backend/BUILD.bazel b/java/debugger/backend/BUILD.bazel new file mode 100644 index 000000000000..0bc1948a1de4 --- /dev/null +++ b/java/debugger/backend/BUILD.bazel @@ -0,0 +1,29 @@ +### auto-generated section `build intellij.java.debugger.impl.backend` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "java-debugger-impl-backend_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "java-debugger-impl-backend", + module_name = "intellij.java.debugger.impl.backend", + visibility = ["//visibility:public"], + srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True), + deps = [ + "@lib//:kotlin-stdlib", + "//platform/kernel/shared:kernel", + "//platform/xdebugger-api:debugger", + "//platform/xdebugger-impl:debugger-impl", + "//platform/platform-impl:ide-impl", + "@lib//:kotlinx-coroutines-core", + "@lib//:kotlinx-serialization-core", + "@lib//:kotlinx-serialization-json", + "//java/debugger/shared:java-debugger-impl-shared", + "//platform/kernel/rpc.backend:rpc-backend", + ], + runtime_deps = [":java-debugger-impl-backend_resources"] +) +### auto-generated section `build intellij.java.debugger.impl.backend` end \ No newline at end of file diff --git a/java/debugger/frontend/BUILD.bazel b/java/debugger/frontend/BUILD.bazel new file mode 100644 index 000000000000..08313d0d56de --- /dev/null +++ b/java/debugger/frontend/BUILD.bazel @@ -0,0 +1,30 @@ +### auto-generated section `build intellij.java.debugger.impl.frontend` start +load("@rules_jvm//:jvm.bzl", "jvm_library", "jvm_resources") + +jvm_resources( + name = "java-debugger-impl-frontend_resources", + files = glob(["resources/**/*"]), + strip_prefix = "resources" +) + +jvm_library( + name = "java-debugger-impl-frontend", + module_name = "intellij.java.debugger.impl.frontend", + visibility = ["//visibility:public"], + srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True), + deps = [ + "@lib//:kotlin-stdlib", + "//platform/kernel/shared:kernel", + "//platform/xdebugger-api:debugger", + "//platform/xdebugger-impl:debugger-impl", + "//platform/platform-impl:ide-impl", + "//platform/core-ui", + "@lib//:kotlinx-coroutines-core", + "@lib//:kotlinx-serialization-core", + "@lib//:kotlinx-serialization-json", + "//java/debugger/shared:java-debugger-impl-shared", + "//platform/xdebugger-impl/frontend:debugger-impl-frontend", + ], + runtime_deps = [":java-debugger-impl-frontend_resources"] +) +### auto-generated section `build intellij.java.debugger.impl.frontend` end \ No newline at end of file diff --git a/java/debugger/shared/BUILD.bazel b/java/debugger/shared/BUILD.bazel index 7478d879211d..26fb7370c81e 100644 --- a/java/debugger/shared/BUILD.bazel +++ b/java/debugger/shared/BUILD.bazel @@ -19,6 +19,11 @@ jvm_library( "//platform/xdebugger-api:debugger", "//platform/xdebugger-impl:debugger-impl", "//platform/platform-impl:ide-impl", + "//platform/kernel/shared:kernel", + "//platform/core-ui", + "@lib//:kotlinx-coroutines-core", + "@lib//:kotlinx-serialization-core", + "@lib//:kotlinx-serialization-json", ], runtime_deps = [":java-debugger-impl-shared_resources"] ) diff --git a/java/java-frontback-tests/BUILD.bazel b/java/java-frontback-tests/BUILD.bazel index 28d0d4119b5f..a437c4b5d1cf 100644 --- a/java/java-frontback-tests/BUILD.bazel +++ b/java/java-frontback-tests/BUILD.bazel @@ -27,7 +27,7 @@ jvm_library( "//platform/platform-tests:tests_test_lib", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark", "//tools/intellij.tools.ide.metrics.benchmark:ide-metrics-benchmark_test_lib", - "//java/testFramework", + "//java/testFramework/shared:java-testFramework-shared", "//java/java-impl:impl", ] ) diff --git a/java/plugin/BUILD.bazel b/java/plugin/BUILD.bazel index 5fe18e4a3cfb..315404751d82 100644 --- a/java/plugin/BUILD.bazel +++ b/java/plugin/BUILD.bazel @@ -17,6 +17,8 @@ java_library( "//java/compiler/charts:java-compiler-charts", "//java/debugger/impl:java-debugger-impl", "//java/debugger/shared:java-debugger-impl-shared", + "//java/debugger/frontend:java-debugger-impl-frontend", + "//java/debugger/backend:java-debugger-impl-backend", "//xml/dom-impl", "//java/debugger/memory-agent:java-debugger-memory-agent", "//java/execution/impl:java-execution-impl", diff --git a/java/testFramework/BUILD.bazel b/java/testFramework/BUILD.bazel index 3d65509c3d37..dc177d517fab 100644 --- a/java/testFramework/BUILD.bazel +++ b/java/testFramework/BUILD.bazel @@ -8,6 +8,7 @@ jvm_library( srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True), deps = [ "//java/openapi:java", + "//java/testFramework/shared:java-testFramework-shared", "//platform/util", "@lib//:junit4", "//platform/util/jdom", @@ -39,6 +40,7 @@ jvm_library( "//platform/xdebugger-testFramework:debugger-testFramework", ], exports = [ + "//java/testFramework/shared:java-testFramework-shared", "//platform/util", "//platform/lang-api:lang", "//java/java-impl:impl", diff --git a/java/testFramework/shared/BUILD.bazel b/java/testFramework/shared/BUILD.bazel new file mode 100644 index 000000000000..6fa19b6318aa --- /dev/null +++ b/java/testFramework/shared/BUILD.bazel @@ -0,0 +1,26 @@ +### auto-generated section `build intellij.java.testFramework.shared` start +load("@rules_jvm//:jvm.bzl", "jvm_library") + +jvm_library( + name = "java-testFramework-shared", + module_name = "intellij.java.testFramework.shared", + visibility = ["//visibility:public"], + srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True), + deps = [ + "//java/openapi:java", + "//platform/util", + "@lib//:junit4", + "//platform/util/jdom", + "//platform/lang-api:lang", + "//java/java-impl:impl", + "//platform/testFramework", + "//java/idea-ui:ui", + "@lib//:org-codehaus-groovy-groovy", + ], + exports = [ + "//platform/util", + "//platform/lang-api:lang", + "//java/java-impl:impl", + ] +) +### auto-generated section `build intellij.java.testFramework.shared` end \ No newline at end of file diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 27f21a689cd8..f58cc6d91c53 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -2490,15 +2490,15 @@ java_import( kt_jvm_import( name = "jediterm-core", - jar = "@jediterm-core-3_49_http//file", - srcjar = "@jediterm-core-3_49-sources_http//file", + jar = "@jediterm-core-3_50_http//file", + srcjar = "@jediterm-core-3_50-sources_http//file", visibility = ["//visibility:public"] ) kt_jvm_import( name = "jediterm-ui", - jar = "@jediterm-ui-3_49_http//file", - srcjar = "@jediterm-ui-3_49-sources_http//file", + jar = "@jediterm-ui-3_50_http//file", + srcjar = "@jediterm-ui-3_50-sources_http//file", visibility = ["//visibility:public"] ) diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 2aacfc1163c6..ff71e737a661 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -3402,31 +3402,31 @@ http_file( ) http_file( - name = "jediterm-core-3_49_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/jediterm/jediterm-core/3.49/jediterm-core-3.49.jar", - sha256 = "ad3049ab737aa1b380eec4a8ed6c3f7758362e872295f647bb0ccd575dc38ce4", - downloaded_file_path = "jediterm-core-3.49.jar" + name = "jediterm-core-3_50_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/jediterm/jediterm-core/3.50/jediterm-core-3.50.jar", + sha256 = "7c7c167d615c3951a208461f2cfac098a7d6790ac0e09b075b7988933ff76f13", + downloaded_file_path = "jediterm-core-3.50.jar" ) http_file( - name = "jediterm-core-3_49-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/jediterm/jediterm-core/3.49/jediterm-core-3.49-sources.jar", - sha256 = "958d5966b48d7ef584e49608594ce97e5af0ddb4ff6fa051866c5f9d77020b72", - downloaded_file_path = "jediterm-core-3.49-sources.jar" + name = "jediterm-core-3_50-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/jediterm/jediterm-core/3.50/jediterm-core-3.50-sources.jar", + sha256 = "976571e586b7fe44c472c02b9e2a91bb62d6cf9599cd08765ec6981bcc7bd35f", + downloaded_file_path = "jediterm-core-3.50-sources.jar" ) http_file( - name = "jediterm-ui-3_49_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/jediterm/jediterm-ui/3.49/jediterm-ui-3.49.jar", - sha256 = "636a95f65d36664691023694bf1196e35a493c7e44eb44edc090cbcb53f1320f", - downloaded_file_path = "jediterm-ui-3.49.jar" + name = "jediterm-ui-3_50_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/jediterm/jediterm-ui/3.50/jediterm-ui-3.50.jar", + sha256 = "0571a3cbfb1b7f1604d59b5c59457d7c1430f14c043052122131430a4f5ff465", + downloaded_file_path = "jediterm-ui-3.50.jar" ) http_file( - name = "jediterm-ui-3_49-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/jediterm/jediterm-ui/3.49/jediterm-ui-3.49-sources.jar", - sha256 = "1a7b08514d0337d40cc421093e3fb7518e9c96f17e4ab083c89d9cf5fc419f2b", - downloaded_file_path = "jediterm-ui-3.49-sources.jar" + name = "jediterm-ui-3_50-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/org/jetbrains/jediterm/jediterm-ui/3.50/jediterm-ui-3.50-sources.jar", + sha256 = "b82b33749ba3c4f4a8a5f17c2da741b4b6e750852682a7299a28aa705acb7116", + downloaded_file_path = "jediterm-ui-3.50-sources.jar" ) http_file( diff --git a/plugins/gitlab/gitlab-core/BUILD.bazel b/plugins/gitlab/gitlab-core/BUILD.bazel index 2c942d99d0a9..221bb39a1d47 100644 --- a/plugins/gitlab/gitlab-core/BUILD.bazel +++ b/plugins/gitlab/gitlab-core/BUILD.bazel @@ -44,7 +44,6 @@ jvm_library( "//platform/statistics", "//platform/vcs-log/api:vcs-log", "@lib//:jsoup", - "//json", "//platform/util/coroutines", ], runtime_deps = [":vcs-gitlab_resources"] @@ -103,7 +102,6 @@ jvm_library( "@lib//:testcontainers", "//platform/testFramework/junit5", "//platform/testFramework/junit5:junit5_test_lib", - "//json", "//platform/util/coroutines", "@lib//:io-mockk", "@lib//:io-mockk-jvm", diff --git a/plugins/kotlin/code-insight/intentions-shared/BUILD.bazel b/plugins/kotlin/code-insight/intentions-shared/BUILD.bazel index 73e74bd53b03..ac31aaba3731 100644 --- a/plugins/kotlin/code-insight/intentions-shared/BUILD.bazel +++ b/plugins/kotlin/code-insight/intentions-shared/BUILD.bazel @@ -32,6 +32,7 @@ jvm_library( "//plugins/kotlin/base/psi:kotlin-base-psi", "//plugins/kotlin/base/resources:kotlin-base-resources", "//plugins/kotlin/base/code-insight:kotlin-base-code-insight", + "//plugins/kotlin/core", "//plugins/kotlin/code-insight/api:kotlin-code-insight-api", "//plugins/kotlin/code-insight/utils:kotlin-code-insight-utils", "//plugins/kotlin/code-insight/descriptions:kotlin-code-insight-descriptions", diff --git a/plugins/markdown/test/BUILD.bazel b/plugins/markdown/test/BUILD.bazel index c74ac21adf02..151cd3bf9df4 100644 --- a/plugins/markdown/test/BUILD.bazel +++ b/plugins/markdown/test/BUILD.bazel @@ -34,6 +34,7 @@ jvm_library( "//platform/platform-util-netty:ide-util-netty", "//platform/testFramework", "//platform/testFramework:testFramework_test_lib", + "//xml/tests:tests_test_lib", "//plugins/IntelliLang/xml-support:xml-langInjection", "//platform/platform-tests:tests_test_lib", "@lib//:jsoup", diff --git a/xml/xml-frontback-impl/BUILD.bazel b/xml/xml-frontback-impl/BUILD.bazel index 633ec6d2a325..d1280f6692b5 100644 --- a/xml/xml-frontback-impl/BUILD.bazel +++ b/xml/xml-frontback-impl/BUILD.bazel @@ -16,6 +16,7 @@ jvm_library( "@lib//:kotlin-stdlib", "//platform/core-api:core", "//platform/core-impl", + "//platform/editor-ui-api:editor-ui", "//platform/util", "//platform/util:util-ui", "//xml/xml-parser:parser",