From b84ac0c3d108f66b235d6a6e74aa224ab45e3dbc Mon Sep 17 00:00:00 2001 From: "Dennis.Scheffer" Date: Tue, 23 Sep 2025 10:08:59 +0200 Subject: [PATCH] AP-7777 Update ap-validation library version. GitOrigin-RevId: 9628fa6823a4b7f016c76a483b26f8e899a55fd7 --- ..._jetbrains_fus_reporting_ap_validation.xml | 18 ----- ...brains_fus_reporting_ap_validation_all.xml | 20 +++++ ...ml => com_jetbrains_fus_reporting_api.xml} | 12 +-- ..._jetbrains_fus_reporting_configuration.xml | 18 ----- ...brains_fus_reporting_connection_client.xml | 18 ----- ...ns_fus_reporting_serialization_jackson.xml | 18 +++++ ...ins_fus_reporting_serialization_kotlin.xml | 18 ----- lib/BUILD.bazel | 32 +++----- lib/MODULE.bazel | 76 ++++++------------- platform/build-scripts/BUILD.bazel | 6 +- .../intellij.platform.buildScripts.iml | 6 +- .../build/CommunityLibraryLicenses.kt | 8 +- platform/platform-tests/BUILD.bazel | 8 +- .../intellij.platform.tests.iml | 8 +- platform/statistics/BUILD.bazel | 24 +++--- platform/statistics/envTests/BUILD.bazel | 7 +- .../intellij.platform.statistics.envTests.iml | 7 +- .../intellij.platform.statistics.iml | 8 +- platform/statistics/uploader/BUILD.bazel | 8 +- .../intellij.platform.statistics.uploader.iml | 8 +- python/BUILD.bazel | 3 +- python/intellij.python.community.impl.iml | 3 +- 22 files changed, 117 insertions(+), 217 deletions(-) delete mode 100644 .idea/libraries/com_jetbrains_fus_reporting_ap_validation.xml create mode 100644 .idea/libraries/com_jetbrains_fus_reporting_ap_validation_all.xml rename .idea/libraries/{com_jetbrains_fus_reporting_model.xml => com_jetbrains_fus_reporting_api.xml} (58%) delete mode 100644 .idea/libraries/com_jetbrains_fus_reporting_configuration.xml delete mode 100644 .idea/libraries/com_jetbrains_fus_reporting_connection_client.xml create mode 100644 .idea/libraries/com_jetbrains_fus_reporting_serialization_jackson.xml delete mode 100644 .idea/libraries/com_jetbrains_fus_reporting_serialization_kotlin.xml diff --git a/.idea/libraries/com_jetbrains_fus_reporting_ap_validation.xml b/.idea/libraries/com_jetbrains_fus_reporting_ap_validation.xml deleted file mode 100644 index 107d665e9e99..000000000000 --- a/.idea/libraries/com_jetbrains_fus_reporting_ap_validation.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - 3c8c66663148ac5d2a953cb048a1939b96be543d4612c23e030a7c6fd20390cd - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_jetbrains_fus_reporting_ap_validation_all.xml b/.idea/libraries/com_jetbrains_fus_reporting_ap_validation_all.xml new file mode 100644 index 000000000000..902b2210510f --- /dev/null +++ b/.idea/libraries/com_jetbrains_fus_reporting_ap_validation_all.xml @@ -0,0 +1,20 @@ + + + + + + 9921601d14966cf0f9231fd2b92ba9a5b65b02c92a3a9ebc2049c8b2710a2eea + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/com_jetbrains_fus_reporting_model.xml b/.idea/libraries/com_jetbrains_fus_reporting_api.xml similarity index 58% rename from .idea/libraries/com_jetbrains_fus_reporting_model.xml rename to .idea/libraries/com_jetbrains_fus_reporting_api.xml index 194df54d423e..f5c3ae38b601 100644 --- a/.idea/libraries/com_jetbrains_fus_reporting_model.xml +++ b/.idea/libraries/com_jetbrains_fus_reporting_api.xml @@ -1,18 +1,18 @@ - - + + - - 8aa0be7e7c1a46ef0827d98c026d328a6f9be27aed79b36692a7f38bacd41a6a + + bd122fb2110ec009cf3143aef5e2d473611b5e015c0d2701686eb94200e538ca - + - + \ No newline at end of file diff --git a/.idea/libraries/com_jetbrains_fus_reporting_configuration.xml b/.idea/libraries/com_jetbrains_fus_reporting_configuration.xml deleted file mode 100644 index 75550f6a24cf..000000000000 --- a/.idea/libraries/com_jetbrains_fus_reporting_configuration.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - f138ed43c55cb90192518293a5b46a135221c898b2b05d6c0648645b3d0fac64 - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_jetbrains_fus_reporting_connection_client.xml b/.idea/libraries/com_jetbrains_fus_reporting_connection_client.xml deleted file mode 100644 index 4b6ae3558e95..000000000000 --- a/.idea/libraries/com_jetbrains_fus_reporting_connection_client.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - ca8ebd17e33f333647b905d43fc8cce2ad16abd22bfa99b75cb8a499894648b8 - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/com_jetbrains_fus_reporting_serialization_jackson.xml b/.idea/libraries/com_jetbrains_fus_reporting_serialization_jackson.xml new file mode 100644 index 000000000000..efaafc9714fa --- /dev/null +++ b/.idea/libraries/com_jetbrains_fus_reporting_serialization_jackson.xml @@ -0,0 +1,18 @@ + + + + + + d7f1d4a1e9b2c748fa2b9c7ba41680039be059f5a71e212deb92ab9119d6aaed + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/com_jetbrains_fus_reporting_serialization_kotlin.xml b/.idea/libraries/com_jetbrains_fus_reporting_serialization_kotlin.xml deleted file mode 100644 index eb183f308c03..000000000000 --- a/.idea/libraries/com_jetbrains_fus_reporting_serialization_kotlin.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - 83380929b70dc8e25db327be8680438f3d80087962a88f4dcf061c919ba2fc32 - - - - - - - - - - - - \ No newline at end of file diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 1fe8f0752163..01836ff4c4b0 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -839,37 +839,23 @@ jvm_import( ) jvm_import( - name = "com-jetbrains-fus-reporting-ap-validation", - jar = "@com_jetbrains_fus_reporting-ap-validation-171_http//file", - source_jar = "@com_jetbrains_fus_reporting-ap-validation-171_http//file", + name = "com-jetbrains-fus-reporting-ap-validation-all", + jar = "@com_jetbrains_fus_reporting-ap-validation-all-1_0_205_http//file", + source_jar = "@com_jetbrains_fus_reporting-ap-validation-all-1_0_205_http//file", visibility = ["//visibility:public"] ) jvm_import( - name = "com-jetbrains-fus-reporting-configuration", - jar = "@com_jetbrains_fus_reporting-configuration-171_http//file", - source_jar = "@com_jetbrains_fus_reporting-configuration-171_http//file", + name = "com-jetbrains-fus-reporting-api", + jar = "@com_jetbrains_fus_reporting-api-1_0_205_http//file", + source_jar = "@com_jetbrains_fus_reporting-api-1_0_205_http//file", visibility = ["//visibility:public"] ) jvm_import( - name = "com-jetbrains-fus-reporting-connection-client", - jar = "@com_jetbrains_fus_reporting-connection-client-171_http//file", - source_jar = "@com_jetbrains_fus_reporting-connection-client-171_http//file", - visibility = ["//visibility:public"] -) - -jvm_import( - name = "com-jetbrains-fus-reporting-model", - jar = "@com_jetbrains_fus_reporting-model-171_http//file", - source_jar = "@com_jetbrains_fus_reporting-model-171_http//file", - visibility = ["//visibility:public"] -) - -jvm_import( - name = "com-jetbrains-fus-reporting-serialization-kotlin", - jar = "@com_jetbrains_fus_reporting-serialization-kotlin-171_http//file", - source_jar = "@com_jetbrains_fus_reporting-serialization-kotlin-171_http//file", + name = "com-jetbrains-fus-reporting-serialization-jackson", + jar = "@com_jetbrains_fus_reporting-serialization-jackson-SNAPSHOT_1_0_204_http//file", + source_jar = "@com_jetbrains_fus_reporting-serialization-jackson-SNAPSHOT_1_0_204_http//file", visibility = ["//visibility:public"] ) diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 08273596c34c..fa3acc5e602e 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -721,73 +721,45 @@ http_file( ) http_file( - name = "com_jetbrains_fus_reporting-ap-validation-171_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/ap-validation/171/ap-validation-171.jar", - sha256 = "3c8c66663148ac5d2a953cb048a1939b96be543d4612c23e030a7c6fd20390cd", - downloaded_file_path = "ap-validation-171.jar" + name = "com_jetbrains_fus_reporting-ap-validation-all-1_0_205_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/ap-validation-all/1.0.205/ap-validation-all-1.0.205.jar", + sha256 = "9921601d14966cf0f9231fd2b92ba9a5b65b02c92a3a9ebc2049c8b2710a2eea", + downloaded_file_path = "ap-validation-all-1.0.205.jar" ) http_file( - name = "com_jetbrains_fus_reporting-ap-validation-171-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/ap-validation/171/ap-validation-171-sources.jar", - sha256 = "a98f7ce542e21628b807966bb46790514f05c6ddca15a037c36636bfd859acef", - downloaded_file_path = "ap-validation-171-sources.jar" + name = "com_jetbrains_fus_reporting-ap-validation-all-1_0_205-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/ap-validation-all/1.0.205/ap-validation-all-1.0.205-sources.jar", + sha256 = "57629ade1163f0c382a38eae0b127eb83e1f8aae36b6ca98242bcb2453f0e7b7", + downloaded_file_path = "ap-validation-all-1.0.205-sources.jar" ) http_file( - name = "com_jetbrains_fus_reporting-configuration-171_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/configuration/171/configuration-171.jar", - sha256 = "f138ed43c55cb90192518293a5b46a135221c898b2b05d6c0648645b3d0fac64", - downloaded_file_path = "configuration-171.jar" + name = "com_jetbrains_fus_reporting-api-1_0_205_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/api/1.0.205/api-1.0.205.jar", + sha256 = "bd122fb2110ec009cf3143aef5e2d473611b5e015c0d2701686eb94200e538ca", + downloaded_file_path = "api-1.0.205.jar" ) http_file( - name = "com_jetbrains_fus_reporting-configuration-171-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/configuration/171/configuration-171-sources.jar", - sha256 = "a9a756b91ddfaecc4fe227ff0accbb6b7ff137adb401ffa4adb6bd8fc54db25c", - downloaded_file_path = "configuration-171-sources.jar" + name = "com_jetbrains_fus_reporting-api-1_0_205-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/api/1.0.205/api-1.0.205-sources.jar", + sha256 = "5ce874a15878312c16eeafc73ff14e28e1fc0b72961eb6156cb8c46c04f66aac", + downloaded_file_path = "api-1.0.205-sources.jar" ) http_file( - name = "com_jetbrains_fus_reporting-connection-client-171_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/connection-client/171/connection-client-171.jar", - sha256 = "ca8ebd17e33f333647b905d43fc8cce2ad16abd22bfa99b75cb8a499894648b8", - downloaded_file_path = "connection-client-171.jar" + name = "com_jetbrains_fus_reporting-serialization-jackson-SNAPSHOT_1_0_204_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/serialization-jackson/SNAPSHOT.1.0.204/serialization-jackson-SNAPSHOT.1.0.204.jar", + sha256 = "d7f1d4a1e9b2c748fa2b9c7ba41680039be059f5a71e212deb92ab9119d6aaed", + downloaded_file_path = "serialization-jackson-SNAPSHOT.1.0.204.jar" ) http_file( - name = "com_jetbrains_fus_reporting-connection-client-171-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/connection-client/171/connection-client-171-sources.jar", - sha256 = "9d53829813cfa8c305ed1153c6c173a399eb269aade3e7d121e90b3857a034c3", - downloaded_file_path = "connection-client-171-sources.jar" -) - -http_file( - name = "com_jetbrains_fus_reporting-model-171_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/model/171/model-171.jar", - sha256 = "8aa0be7e7c1a46ef0827d98c026d328a6f9be27aed79b36692a7f38bacd41a6a", - downloaded_file_path = "model-171.jar" -) - -http_file( - name = "com_jetbrains_fus_reporting-model-171-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/model/171/model-171-sources.jar", - sha256 = "b528d8f0b1fcdcee98e626e46be146081b149bc66585f72f7b8932cdc8aa2c8e", - downloaded_file_path = "model-171-sources.jar" -) - -http_file( - name = "com_jetbrains_fus_reporting-serialization-kotlin-171_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/serialization-kotlin/171/serialization-kotlin-171.jar", - sha256 = "83380929b70dc8e25db327be8680438f3d80087962a88f4dcf061c919ba2fc32", - downloaded_file_path = "serialization-kotlin-171.jar" -) - -http_file( - name = "com_jetbrains_fus_reporting-serialization-kotlin-171-sources_http", - url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/serialization-kotlin/171/serialization-kotlin-171-sources.jar", - sha256 = "2e91b1d046e4b6d11c33c4d733ed93e0f694e7c7fcbad6c5968145b0d20b1c44", - downloaded_file_path = "serialization-kotlin-171-sources.jar" + name = "com_jetbrains_fus_reporting-serialization-jackson-SNAPSHOT_1_0_204-sources_http", + url = "https://cache-redirector.jetbrains.com/packages.jetbrains.team/maven/p/ij/intellij-dependencies/com/jetbrains/fus/reporting/serialization-jackson/SNAPSHOT.1.0.204/serialization-jackson-SNAPSHOT.1.0.204-sources.jar", + sha256 = "abc967c13226fc6e8c7cd91d5673d0853312979b60e81a0ceb917edaaffbe505", + downloaded_file_path = "serialization-jackson-SNAPSHOT.1.0.204-sources.jar" ) http_file( diff --git a/platform/build-scripts/BUILD.bazel b/platform/build-scripts/BUILD.bazel index 58061f52e841..737494fd3908 100644 --- a/platform/build-scripts/BUILD.bazel +++ b/platform/build-scripts/BUILD.bazel @@ -82,9 +82,9 @@ jvm_library( "@lib//:netty-tcnative-boringssl", "//platform/util/coroutines", "@community//build:zip", - "@lib//:com-jetbrains-fus-reporting-configuration", - "@lib//:com-jetbrains-fus-reporting-serialization-kotlin", - "@lib//:com-jetbrains-fus-reporting-model", + "@lib//:com-jetbrains-fus-reporting-api", + "@lib//:com-jetbrains-fus-reporting-ap-validation-all", + "@lib//:com-jetbrains-fus-reporting-serialization-jackson", "@lib//:platform-build_scripts-netty", "@lib//:platform-build_scripts-jetbrains-intellij-deps-coverage-reporter", "//libraries/ktor/client", diff --git a/platform/build-scripts/intellij.platform.buildScripts.iml b/platform/build-scripts/intellij.platform.buildScripts.iml index 5dd4e8da30ef..761fdd81a1a7 100644 --- a/platform/build-scripts/intellij.platform.buildScripts.iml +++ b/platform/build-scripts/intellij.platform.buildScripts.iml @@ -227,9 +227,9 @@ - - - + + + diff --git a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt index 88c28aea61b9..a2e50fa9b356 100644 --- a/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt +++ b/platform/build-scripts/src/org/jetbrains/intellij/build/CommunityLibraryLicenses.kt @@ -1386,11 +1386,9 @@ object CommunityLibraryLicenses { jetbrainsLibrary("ai.grazie.spell.gec.engine.local"), jetbrainsLibrary("ai.grazie.spell.hunspell.en"), jetbrainsLibrary("cloud-config-client"), - jetbrainsLibrary("com.jetbrains.fus.reporting.ap.validation"), - jetbrainsLibrary("com.jetbrains.fus.reporting.configuration"), - jetbrainsLibrary("com.jetbrains.fus.reporting.connection.client"), - jetbrainsLibrary("com.jetbrains.fus.reporting.model"), - jetbrainsLibrary("com.jetbrains.fus.reporting.serialization.kotlin"), + jetbrainsLibrary("com.jetbrains.fus.reporting.ap.validation.all"), + jetbrainsLibrary("com.jetbrains.fus.reporting.api"), + jetbrainsLibrary("com.jetbrains.fus.reporting.serialization.jackson"), jetbrainsLibrary("completion-log-events"), jetbrainsLibrary("completion-performance-kotlin"), jetbrainsLibrary("completion-ranking-cpp-exp"), diff --git a/platform/platform-tests/BUILD.bazel b/platform/platform-tests/BUILD.bazel index e88ab608a304..545c558f0473 100644 --- a/platform/platform-tests/BUILD.bazel +++ b/platform/platform-tests/BUILD.bazel @@ -166,10 +166,9 @@ jvm_library( "//platform/plugins/parser/impl", "//platform/plugins/parser/impl:impl_test_lib", "//platform/platform-impl/update-checker", - "@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", + "@lib//:com-jetbrains-fus-reporting-serialization-jackson", + "@lib//:com-jetbrains-fus-reporting-api", + "@lib//:com-jetbrains-fus-reporting-ap-validation-all", "//platform/platform-impl/eel:ide-impl-wsl", "//platform/syntax/syntax-psi-tests:psi-tests_test_lib", "//xml/xml-psi-api:psi", @@ -177,7 +176,6 @@ jvm_library( "//platform/locking.impl", "//platform/testFramework/junit5/highlighting", "//platform/vcs-impl/shared", - "@lib//:com-jetbrains-fus-reporting-connection-client", ], runtime_deps = [ "//xml/dom-impl", diff --git a/platform/platform-tests/intellij.platform.tests.iml b/platform/platform-tests/intellij.platform.tests.iml index c20794010e2f..3ae7859631fa 100644 --- a/platform/platform-tests/intellij.platform.tests.iml +++ b/platform/platform-tests/intellij.platform.tests.iml @@ -145,10 +145,9 @@ - - - - + + + @@ -156,6 +155,5 @@ - \ No newline at end of file diff --git a/platform/statistics/BUILD.bazel b/platform/statistics/BUILD.bazel index 15a5d1eb616f..386d395ef839 100644 --- a/platform/statistics/BUILD.bazel +++ b/platform/statistics/BUILD.bazel @@ -40,15 +40,13 @@ jvm_library( "@lib//:kotlinx-coroutines-core", "//libraries/kotlinx/serialization/json", "//libraries/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", + "@lib//:com-jetbrains-fus-reporting-api", + "@lib//:com-jetbrains-fus-reporting-serialization-jackson", + "@lib//:com-jetbrains-fus-reporting-ap-validation-all", ], exports = [ - "@lib//:com-jetbrains-fus-reporting-model", - "@lib//:com-jetbrains-fus-reporting-ap-validation", + "@lib//:com-jetbrains-fus-reporting-api", + "@lib//:com-jetbrains-fus-reporting-ap-validation-all", ] ) @@ -87,15 +85,13 @@ jvm_library( "@lib//:assert_j", "//libraries/kotlinx/serialization/json", "//libraries/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", + "@lib//:com-jetbrains-fus-reporting-api", + "@lib//:com-jetbrains-fus-reporting-serialization-jackson", + "@lib//:com-jetbrains-fus-reporting-ap-validation-all", ], exports = [ - "@lib//:com-jetbrains-fus-reporting-model", - "@lib//:com-jetbrains-fus-reporting-ap-validation", + "@lib//:com-jetbrains-fus-reporting-api", + "@lib//:com-jetbrains-fus-reporting-ap-validation-all", ] ) ### auto-generated section `build intellij.platform.statistics` end diff --git a/platform/statistics/envTests/BUILD.bazel b/platform/statistics/envTests/BUILD.bazel index 494c8acde2dd..1cd4ebb35c71 100644 --- a/platform/statistics/envTests/BUILD.bazel +++ b/platform/statistics/envTests/BUILD.bazel @@ -21,15 +21,12 @@ 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", + "@lib//:com-jetbrains-fus-reporting-ap-validation-all", "//platform/core-ui", "//platform/statistics/uploader", "//libraries/jackson/jackson", "//libraries/jackson/databind", - "@lib//:com-jetbrains-fus-reporting-connection-client", - "@lib//:com-jetbrains-fus-reporting-serialization-kotlin", + "@lib//:com-jetbrains-fus-reporting-serialization-jackson", ] ) ### auto-generated section `build intellij.platform.statistics.envTests` end diff --git a/platform/statistics/envTests/intellij.platform.statistics.envTests.iml b/platform/statistics/envTests/intellij.platform.statistics.envTests.iml index 6b86363b5b97..1dace3a46968 100644 --- a/platform/statistics/envTests/intellij.platform.statistics.envTests.iml +++ b/platform/statistics/envTests/intellij.platform.statistics.envTests.iml @@ -13,14 +13,11 @@ - - - + - - + \ No newline at end of file diff --git a/platform/statistics/intellij.platform.statistics.iml b/platform/statistics/intellij.platform.statistics.iml index 9a9902313545..ed7c7171d23c 100644 --- a/platform/statistics/intellij.platform.statistics.iml +++ b/platform/statistics/intellij.platform.statistics.iml @@ -37,10 +37,8 @@ - - - - - + + + \ No newline at end of file diff --git a/platform/statistics/uploader/BUILD.bazel b/platform/statistics/uploader/BUILD.bazel index b7abc397eed2..7485573c3c2d 100644 --- a/platform/statistics/uploader/BUILD.bazel +++ b/platform/statistics/uploader/BUILD.bazel @@ -20,11 +20,9 @@ jvm_library( "//libraries/jackson/jackson", "//libraries/jackson/databind", "//libraries/jackson/module-kotlin:libraries-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", - "@lib//:com-jetbrains-fus-reporting-connection-client", + "@lib//:com-jetbrains-fus-reporting-api", + "@lib//:com-jetbrains-fus-reporting-ap-validation-all", + "@lib//:com-jetbrains-fus-reporting-serialization-jackson", ], exports = ["//platform/statistics/config"] ) diff --git a/platform/statistics/uploader/intellij.platform.statistics.uploader.iml b/platform/statistics/uploader/intellij.platform.statistics.uploader.iml index 9ecf4c918754..21a68f0893f9 100644 --- a/platform/statistics/uploader/intellij.platform.statistics.uploader.iml +++ b/platform/statistics/uploader/intellij.platform.statistics.uploader.iml @@ -14,10 +14,8 @@ - - - - - + + + \ No newline at end of file diff --git a/python/BUILD.bazel b/python/BUILD.bazel index 1487c50a7ba6..805864bbe68b 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -344,8 +344,7 @@ 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//:com-jetbrains-fus-reporting-ap-validation-all", "//libraries/http-client", "//libraries/commons/lang3", "@lib//:kaml", diff --git a/python/intellij.python.community.impl.iml b/python/intellij.python.community.impl.iml index 6ea21e6cbb23..44d5bd181a66 100644 --- a/python/intellij.python.community.impl.iml +++ b/python/intellij.python.community.impl.iml @@ -181,8 +181,7 @@ - - +