From fdb78c49dec79755788d2f718c5f17fc38d5cddc Mon Sep 17 00:00:00 2001 From: Liubov Afanaseva Date: Fri, 6 Jun 2025 10:15:56 +0200 Subject: [PATCH] AP-7325: synced Bazel files with JPS model GitOrigin-RevId: bd553269a32c2afce759f2478a30d8c83cc5f9a2 --- lib/BUILD.bazel | 56 +++++++++----- lib/MODULE.bazel | 98 +++++++++++++++++------- platform/build-scripts/BUILD.bazel | 4 +- platform/platform-tests/BUILD.bazel | 5 +- platform/statistics/BUILD.bazel | 21 ++++- platform/statistics/envTests/BUILD.bazel | 4 +- platform/statistics/uploader/BUILD.bazel | 5 +- python/BUILD.bazel | 3 +- 8 files changed, 139 insertions(+), 57 deletions(-) diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index a5803626dd2c..3d56e074280c 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -648,27 +648,6 @@ jvm_import( visibility = ["//visibility:public"] ) -java_library( - name = "ap-validation", - exports = [ - ":ap-validation-76_http_import", - ":model-76_http_import", - ], - visibility = ["//visibility:public"] -) - -jvm_import( - name = "ap-validation-76_http_import", - jar = "@ap-validation-76_http//file", - source_jar = "@ap-validation-76-sources_http//file" -) - -jvm_import( - name = "model-76_http_import", - jar = "@model-76_http//file", - source_jar = "@model-76-sources_http//file" -) - jvm_import( name = "apache-sshd-osgi", jar = "@sshd-osgi-2_15_0_http//file", @@ -858,6 +837,41 @@ jvm_import( visibility = ["//visibility:public"] ) +jvm_import( + name = "com-jetbrains-fus-reporting-ap-validation", + jar = "@ap-validation-134_http//file", + source_jar = "@ap-validation-134-sources_http//file", + visibility = ["//visibility:public"] +) + +jvm_import( + name = "com-jetbrains-fus-reporting-configuration", + jar = "@configuration-134_http//file", + source_jar = "@configuration-134-sources_http//file", + visibility = ["//visibility:public"] +) + +jvm_import( + name = "com-jetbrains-fus-reporting-connection-client", + jar = "@connection-client-134_http//file", + source_jar = "@connection-client-134-sources_http//file", + visibility = ["//visibility:public"] +) + +jvm_import( + name = "com-jetbrains-fus-reporting-model", + jar = "@model-134_http//file", + source_jar = "@model-134-sources_http//file", + visibility = ["//visibility:public"] +) + +jvm_import( + name = "com-jetbrains-fus-reporting-serialization-kotlin", + jar = "@serialization-kotlin-134_http//file", + source_jar = "@serialization-kotlin-134-sources_http//file", + visibility = ["//visibility:public"] +) + jvm_import( name = "commons-cli", jar = "@commons-cli-1_9_0_http//file", diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 122e451edc7d..e06b2a4de9c8 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -474,34 +474,6 @@ http_file( downloaded_file_path = "sdklib-31.5.0-alpha08.jar" ) -http_file( - name = "ap-validation-76_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/ap-validation/76/ap-validation-76.jar", - sha256 = "3d2123e0a17edd77776f083d04b2465fdb30d07484be658db0304587bd54ba07", - downloaded_file_path = "ap-validation-76.jar" -) - -http_file( - name = "model-76_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/model/76/model-76.jar", - sha256 = "2d931e26e6632f608a6dab0fb60d27fae075260bf4532bb6ba8828d81bd167b3", - downloaded_file_path = "model-76.jar" -) - -http_file( - name = "ap-validation-76-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/ap-validation/76/ap-validation-76-sources.jar", - sha256 = "2bd09851d7f94c8fa7c7200b7bc16e6df2e32c4856330315ccc1c5c3aa0e2ad2", - downloaded_file_path = "ap-validation-76-sources.jar" -) - -http_file( - name = "model-76-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/model/76/model-76-sources.jar", - sha256 = "15bd360a82aa002157da0b6b7c580689df5db9cc134d56d774c2cb8a50f2bb26", - downloaded_file_path = "model-76-sources.jar" -) - http_file( name = "sshd-osgi-2_15_0_http", url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/apache/sshd/sshd-osgi/2.15.0/sshd-osgi-2.15.0.jar", @@ -782,6 +754,76 @@ http_file( downloaded_file_path = "cloudconfig-2023.9-sources.jar" ) +http_file( + name = "ap-validation-134_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/ap-validation/134/ap-validation-134.jar", + sha256 = "188a260d833e3182b9764e71bf6ca283083e75edf984addbb18cda8983e16107", + downloaded_file_path = "ap-validation-134.jar" +) + +http_file( + name = "ap-validation-134-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/ap-validation/134/ap-validation-134-sources.jar", + sha256 = "8fc6db778617071cd75bbe69da6d8a41490ec1994e81a9c2990f5fd5fb15b4e5", + downloaded_file_path = "ap-validation-134-sources.jar" +) + +http_file( + name = "configuration-134_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/configuration/134/configuration-134.jar", + sha256 = "c58ea5f79ebfd97700782b1fcd9023d3a875f3aff4ac9f08004a3b455369d35e", + downloaded_file_path = "configuration-134.jar" +) + +http_file( + name = "configuration-134-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/configuration/134/configuration-134-sources.jar", + sha256 = "a17ef48b22110f61366e1c2a5979075213ffbbe6d18000b58147f8e6a07acd15", + downloaded_file_path = "configuration-134-sources.jar" +) + +http_file( + name = "connection-client-134_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/connection-client/134/connection-client-134.jar", + sha256 = "37d162fa8c57f22a0e3985f3802b46132d4ac774d515be46bacc7d465ce8fcfb", + downloaded_file_path = "connection-client-134.jar" +) + +http_file( + name = "connection-client-134-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/connection-client/134/connection-client-134-sources.jar", + sha256 = "33d507cb05755a68d354e4a9b9b5f5da383f93aa1fa4a74c4f83195b52ccfb9f", + downloaded_file_path = "connection-client-134-sources.jar" +) + +http_file( + name = "model-134_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/model/134/model-134.jar", + sha256 = "be7ec5d04a89a47bff030be33c402505461cc9a88ed2b1654b6004aa24b03d29", + downloaded_file_path = "model-134.jar" +) + +http_file( + name = "model-134-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/model/134/model-134-sources.jar", + sha256 = "9dfd10956200626c580d0cd8a3483961f6dd3862c914517bc69606bba0aeb245", + downloaded_file_path = "model-134-sources.jar" +) + +http_file( + name = "serialization-kotlin-134_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/serialization-kotlin/134/serialization-kotlin-134.jar", + sha256 = "ba4ee8bdedc23b8873e43932e51f5ece07473c45db8c59f4c3ebf2249d357f9c", + downloaded_file_path = "serialization-kotlin-134.jar" +) + +http_file( + name = "serialization-kotlin-134-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/serialization-kotlin/134/serialization-kotlin-134-sources.jar", + sha256 = "5455dc642a93195c9368ceec8e21c396aab3cea11aaac81fe61037545b73c208", + downloaded_file_path = "serialization-kotlin-134-sources.jar" +) + http_file( name = "commons-cli-1_9_0_http", url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/commons-cli/commons-cli/1.9.0/commons-cli-1.9.0.jar", diff --git a/platform/build-scripts/BUILD.bazel b/platform/build-scripts/BUILD.bazel index 6caba10a3262..d6561ea8eef4 100644 --- a/platform/build-scripts/BUILD.bazel +++ b/platform/build-scripts/BUILD.bazel @@ -37,7 +37,6 @@ jvm_library( "//platform/testFramework/core", "//platform/util-class-loader:util-classLoader", "@lib//:jackson-jr-objects", - "//platform/statistics/config", "@lib//:fastutil-min", "@lib//:gson", "@lib//:protobuf", @@ -89,6 +88,9 @@ jvm_library( "@lib//:netty-tcnative-boringssl", "//platform/util/coroutines", "@rules_jvm//zip", + "@lib//:com-jetbrains-fus-reporting-configuration", + "@lib//:com-jetbrains-fus-reporting-serialization-kotlin", + "@lib//:com-jetbrains-fus-reporting-model", ], runtime_deps = [ "@lib//:commons-cli", diff --git a/platform/platform-tests/BUILD.bazel b/platform/platform-tests/BUILD.bazel index 2fa58dc6f17c..6a895ba47255 100644 --- a/platform/platform-tests/BUILD.bazel +++ b/platform/platform-tests/BUILD.bazel @@ -87,7 +87,6 @@ jvm_library( "//platform/code-style-impl:codeStyle-impl", "//platform/statistics/uploader", "//platform/platform-util-io:ide-util-io", - "@lib//:ap-validation", "@lib//:aalto-xml", "//platform/util/xmlDom", "//platform/platform-util-io-impl:ide-util-io-impl", @@ -153,6 +152,10 @@ jvm_library( "//platform/testFramework/junit5/projectStructure", "//platform/testFramework/junit5/projectStructure:projectStructure_test_lib", "//platform/plugins/parser/impl", + "@lib//:com-jetbrains-fus-reporting-model", + "@lib//:com-jetbrains-fus-reporting-serialization-kotlin", + "@lib//:com-jetbrains-fus-reporting-configuration", + "@lib//:com-jetbrains-fus-reporting-ap-validation", "//platform/platform-impl/eel:ide-impl-wsl", "//platform/syntax/syntax-psi-tests:psi-tests_test_lib", "//xml/xml-psi-api:psi", diff --git a/platform/statistics/BUILD.bazel b/platform/statistics/BUILD.bazel index 0f76930c2dde..e2924e9c32d3 100644 --- a/platform/statistics/BUILD.bazel +++ b/platform/statistics/BUILD.bazel @@ -23,7 +23,6 @@ jvm_library( "//platform/core-ui", "@lib//:jna", "//platform/util", - "@lib//:ap-validation", "//platform/runtime/product", "//platform/platform-util-io:ide-util-io", "//platform/util-ex", @@ -37,8 +36,18 @@ jvm_library( "@lib//:jackson-module-kotlin", "@lib//:kotlin-reflect", "@lib//:kotlinx-coroutines-core", + "@lib//:kotlinx-serialization-json", + "@lib//:kotlinx-serialization-core", + "@lib//:com-jetbrains-fus-reporting-model", + "@lib//:com-jetbrains-fus-reporting-serialization-kotlin", + "@lib//:com-jetbrains-fus-reporting-connection-client", + "@lib//:com-jetbrains-fus-reporting-configuration", + "@lib//:com-jetbrains-fus-reporting-ap-validation", + ], + exports = [ + "@lib//:com-jetbrains-fus-reporting-model", + "@lib//:com-jetbrains-fus-reporting-ap-validation", ], - exports = ["@lib//:ap-validation"], runtime_deps = [":statistics_resources"] ) @@ -59,7 +68,6 @@ jvm_library( "//platform/core-ui", "@lib//:jna", "//platform/util", - "@lib//:ap-validation", "//platform/runtime/product", "//platform/platform-util-io:ide-util-io", "//platform/util-ex", @@ -75,6 +83,13 @@ jvm_library( "@lib//:kotlinx-coroutines-core", "@lib//:junit5", "@lib//:assert_j", + "@lib//:kotlinx-serialization-json", + "@lib//:kotlinx-serialization-core", + "@lib//:com-jetbrains-fus-reporting-model", + "@lib//:com-jetbrains-fus-reporting-serialization-kotlin", + "@lib//:com-jetbrains-fus-reporting-connection-client", + "@lib//:com-jetbrains-fus-reporting-configuration", + "@lib//:com-jetbrains-fus-reporting-ap-validation", ], runtime_deps = [":statistics_resources"] ) diff --git a/platform/statistics/envTests/BUILD.bazel b/platform/statistics/envTests/BUILD.bazel index 125595832f85..e0a24865c3e0 100644 --- a/platform/statistics/envTests/BUILD.bazel +++ b/platform/statistics/envTests/BUILD.bazel @@ -19,9 +19,11 @@ jvm_library( "@lib//:testcontainers", "//platform/statistics", "//platform/statistics:statistics_test_lib", + "@lib//:com-jetbrains-fus-reporting-model", + "@lib//:com-jetbrains-fus-reporting-ap-validation", + "@lib//:com-jetbrains-fus-reporting-configuration", "//platform/core-ui", "//platform/statistics/uploader", - "@lib//:ap-validation", "@lib//:jackson", "@lib//:jackson-databind", ] diff --git a/platform/statistics/uploader/BUILD.bazel b/platform/statistics/uploader/BUILD.bazel index a4563946e6a2..43817cead36a 100644 --- a/platform/statistics/uploader/BUILD.bazel +++ b/platform/statistics/uploader/BUILD.bazel @@ -16,10 +16,13 @@ jvm_library( "@lib//:jetbrains-annotations", "@lib//:kotlin-stdlib", "//platform/statistics/config", - "@lib//:ap-validation", "@lib//:jackson", "@lib//:jackson-databind", "@lib//:jackson-module-kotlin", + "@lib//:com-jetbrains-fus-reporting-model", + "@lib//:com-jetbrains-fus-reporting-serialization-kotlin", + "@lib//:com-jetbrains-fus-reporting-configuration", + "@lib//:com-jetbrains-fus-reporting-ap-validation", ], exports = ["//platform/statistics/config"], runtime_deps = [":uploader_resources"] diff --git a/python/BUILD.bazel b/python/BUILD.bazel index ea6174999db0..a47e5902af21 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -266,7 +266,6 @@ jvm_library( "//platform/platform-impl/remote", "//platform/platform-impl/ui", "@lib//:jackson-module-kotlin", - "@lib//:ap-validation", "//python/poetry", "//python/installer", "//platform/eel", @@ -280,6 +279,8 @@ jvm_library( "//python/python-hatch:hatch", "//platform/external-system-impl:externalSystem-impl", "//platform/external-system-api:externalSystem", + "@lib//:com-jetbrains-fus-reporting-model", + "@lib//:com-jetbrains-fus-reporting-ap-validation", "@lib//:http-client", "@lib//:commons-lang3", "//python/impl.helperLocator:community-helpersLocator",