From dc6eeb2807c965f26570ea26027ebc0273e6821e Mon Sep 17 00:00:00 2001 From: Ilia Kirianovskii Date: Wed, 9 Apr 2025 16:22:21 +0200 Subject: [PATCH] [bazel] Update build files GitOrigin-RevId: fbda4d5ad7a925948c6bad9040b3020b61e4e9f5 --- fleet/kernel/BUILD.bazel | 2 +- fleet/rhizomedb/BUILD.bazel | 2 +- lib/BUILD.bazel | 25 +++++----------- lib/MODULE.bazel | 30 +++++-------------- platform/searchEverywhere/backend/BUILD.bazel | 3 ++ platform/searchEverywhere/shared/BUILD.bazel | 2 +- tools/apiDump/BUILD.bazel | 4 ++- 7 files changed, 25 insertions(+), 43 deletions(-) diff --git a/fleet/kernel/BUILD.bazel b/fleet/kernel/BUILD.bazel index e53fbdbd28ec..0dc91f98fd65 100644 --- a/fleet/kernel/BUILD.bazel +++ b/fleet/kernel/BUILD.bazel @@ -14,7 +14,7 @@ jvm_library( name = "kernel", module_name = "fleet.kernel", visibility = ["//visibility:public"], - srcs = glob(["src/**/*.kt", "src/**/*.java", "srcJvmMain/**/*.kt", "srcJvmMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), + srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java", "srcJvmMain/**/*.kt", "srcJvmMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), kotlinc_opts = ":custom", deps = [ "@lib//:kotlin-stdlib", diff --git a/fleet/rhizomedb/BUILD.bazel b/fleet/rhizomedb/BUILD.bazel index 042f79f8deec..72e9df880cc4 100644 --- a/fleet/rhizomedb/BUILD.bazel +++ b/fleet/rhizomedb/BUILD.bazel @@ -12,7 +12,7 @@ jvm_library( name = "rhizomedb", module_name = "fleet.rhizomedb", visibility = ["//visibility:public"], - srcs = glob(["src/main/kotlin/**/*.kt", "src/main/kotlin/**/*.java", "srcJvmMain/**/*.kt", "srcJvmMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), + srcs = glob(["srcCommonMain/**/*.kt", "srcCommonMain/**/*.java", "srcJvmMain/**/*.kt", "srcJvmMain/**/*.java"], allow_empty = True, exclude = ["**/module-info.java"]), kotlinc_opts = ":custom", deps = [ "//fleet/util/core:fleet-util-core", diff --git a/lib/BUILD.bazel b/lib/BUILD.bazel index 63969fda4ef1..8b893afe3616 100644 --- a/lib/BUILD.bazel +++ b/lib/BUILD.bazel @@ -8818,27 +8818,18 @@ java_import( visibility = ["//visibility:public"] ) -java_library( - name = "tools-api_dump-kotlinx-bcv", - exports = [ - ":binary-compatibility-validator-0_14_0_http_import", - ":kotlinx-metadata-jvm-0_6_2_http_import", - ":asm-9_6_http_import", - ":asm-tree-9_6_http_import", - ], +kt_jvm_import( + name = "tools-api_dump-kotlin-metadata-bcv", + jar = "@kotlin-metadata-jvm-2_0_0_http//file", + srcjar = "@kotlin-metadata-jvm-2_0_0-sources_http//file", visibility = ["//visibility:public"] ) kt_jvm_import( - name = "binary-compatibility-validator-0_14_0_http_import", - jar = "@binary-compatibility-validator-0_14_0_http//file", - srcjar = "@binary-compatibility-validator-0_14_0-sources_http//file" -) - -kt_jvm_import( - name = "kotlinx-metadata-jvm-0_6_2_http_import", - jar = "@kotlinx-metadata-jvm-0_6_2_http//file", - srcjar = "@kotlinx-metadata-jvm-0_6_2-sources_http//file" + name = "tools-api_dump-kotlinx-bcv", + jar = "@binary-compatibility-validator-0_17_0_http//file", + srcjar = "@binary-compatibility-validator-0_17_0-sources_http//file", + visibility = ["//visibility:public"] ) java_library( diff --git a/lib/MODULE.bazel b/lib/MODULE.bazel index 8d02038ffe9f..d23ef9f3b6e9 100644 --- a/lib/MODULE.bazel +++ b/lib/MODULE.bazel @@ -12754,31 +12754,17 @@ http_file( ) http_file( - name = "binary-compatibility-validator-0_14_0_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/binary-compatibility-validator/0.14.0/binary-compatibility-validator-0.14.0.jar", - sha256 = "bc4224bdfd69330aa9d3f90914f0bd41fa3bb8eb7741d7f65a925404c0e55807", - downloaded_file_path = "binary-compatibility-validator-0.14.0.jar" + name = "binary-compatibility-validator-0_17_0_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/binary-compatibility-validator/0.17.0/binary-compatibility-validator-0.17.0.jar", + sha256 = "0c8d35914a9094ab7071001c5b789e20d5f80d284c70a915a1ecb8fcecf92031", + downloaded_file_path = "binary-compatibility-validator-0.17.0.jar" ) http_file( - name = "kotlinx-metadata-jvm-0_6_2_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.6.2/kotlinx-metadata-jvm-0.6.2.jar", - sha256 = "8f5759b435fcbcfdf06c80295013ba953db4ec817b04d7809c61a739a483527b", - downloaded_file_path = "kotlinx-metadata-jvm-0.6.2.jar" -) - -http_file( - name = "binary-compatibility-validator-0_14_0-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/binary-compatibility-validator/0.14.0/binary-compatibility-validator-0.14.0-sources.jar", - sha256 = "7715223056b15320d869437df5473415d0d958cfb10c958f536d0baba6af68d8", - downloaded_file_path = "binary-compatibility-validator-0.14.0-sources.jar" -) - -http_file( - name = "kotlinx-metadata-jvm-0_6_2-sources_http", - url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.6.2/kotlinx-metadata-jvm-0.6.2-sources.jar", - sha256 = "9f8a7855566b57fb81e584ca4dff44f986b158b2d9b58abfd6d32b447c8f2454", - downloaded_file_path = "kotlinx-metadata-jvm-0.6.2-sources.jar" + name = "binary-compatibility-validator-0_17_0-sources_http", + url = "https://cache-redirector.jetbrains.com/repo1.maven.org/maven2/org/jetbrains/kotlinx/binary-compatibility-validator/0.17.0/binary-compatibility-validator-0.17.0-sources.jar", + sha256 = "5257cdca3d1e7ad4b47fdb5b928a364710b792fe134d3feea58ec17813ac5f63", + downloaded_file_path = "binary-compatibility-validator-0.17.0-sources.jar" ) http_file( diff --git a/platform/searchEverywhere/backend/BUILD.bazel b/platform/searchEverywhere/backend/BUILD.bazel index 7955b1612ae1..e8b3e5c42ffa 100644 --- a/platform/searchEverywhere/backend/BUILD.bazel +++ b/platform/searchEverywhere/backend/BUILD.bazel @@ -23,6 +23,9 @@ jvm_library( "//platform/util", "//platform/platform-impl/rpc:ide-rpc", "//platform/core-ui", + "//platform/editor-ui-api:editor-ui", + "//platform/usageView", + "//platform/util/text-matching", ], runtime_deps = [ ":backend_resources", diff --git a/platform/searchEverywhere/shared/BUILD.bazel b/platform/searchEverywhere/shared/BUILD.bazel index e698f3787cfc..b63ccd613011 100644 --- a/platform/searchEverywhere/shared/BUILD.bazel +++ b/platform/searchEverywhere/shared/BUILD.bazel @@ -27,8 +27,8 @@ jvm_library( "//platform/editor-ui-api:editor-ui", "//platform/platform-impl/rpc:ide-rpc", "//platform/util/text-matching", - "//platform/usageView", ], + exports = ["//platform/lang-impl"], runtime_deps = [":searchEverywhere_resources"] ) ### auto-generated section `build intellij.platform.searchEverywhere` end \ No newline at end of file diff --git a/tools/apiDump/BUILD.bazel b/tools/apiDump/BUILD.bazel index 13c2211e4019..4dab17dfc762 100644 --- a/tools/apiDump/BUILD.bazel +++ b/tools/apiDump/BUILD.bazel @@ -7,8 +7,10 @@ jvm_library( visibility = ["//visibility:public"], srcs = glob(["src/**/*.kt", "src/**/*.java"], allow_empty = True), deps = [ - "@lib//:kotlin-stdlib", "@lib//:jetbrains-annotations", + "@lib//:kotlin-stdlib", + "@lib//:tools-api_dump-kotlin-metadata-bcv", + "@lib//:asm-tools", "@lib//:tools-api_dump-kotlinx-bcv", "@lib//:kotlinx-collections-immutable", ]