From 58aee13078353e635a6258fa60f072f684d25371 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 10 Mar 2026 11:42:12 -0700 Subject: [PATCH] Bazel 9.0.1 --- .bazelversion | 2 +- MODULE.bazel | 26 +-- MODULE.bazel.lock | 199 ++++++++++++++++-- scala/0001-protobuf-19679-rm-protoc-dep.patch | 91 -------- 4 files changed, 197 insertions(+), 121 deletions(-) delete mode 100644 scala/0001-protobuf-19679-rm-protoc-dep.patch diff --git a/.bazelversion b/.bazelversion index f7ee0669..37ad5c8b 100644 --- a/.bazelversion +++ b/.bazelversion @@ -1 +1 @@ -9.0.0 +9.0.1 diff --git a/MODULE.bazel b/MODULE.bazel index 5f683bcf..bafef502 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -47,16 +47,10 @@ http_archive( register_toolchains("@rules_scala_protoc_toolchains//:all") -bazel_dep(name = "bazel_skylib", version = "1.8.2") +bazel_dep(name = "bazel_skylib", version = "1.9.0") bazel_dep(name = "engflowapis-java", version = "2025.03.14-12.58.52") bazel_dep(name = "platforms", version = "1.0.0") -bazel_dep(name = "protobuf", version = "33.0") -single_version_override( - module_name = "protobuf", - patch_strip = 1, - patches = ["//scala:0001-protobuf-19679-rm-protoc-dep.patch"], - version = "33.0", -) +bazel_dep(name = "protobuf", version = "33.4") # Per the instructions from: # https://github.com/bazelbuild/apple_support?tab=readme-ov-file#bazel-7-setup @@ -64,8 +58,8 @@ single_version_override( # If you also depend on `rules_cc`, `apple_support` must come _above_ `rules_cc` # in your `MODULE.bazel` or `WORKSPACE` file because Bazel selects toolchains # based on which is registered first. -bazel_dep(name = "apple_support", version = "1.24.2") -bazel_dep(name = "rules_cc", version = "0.2.14") +bazel_dep(name = "apple_support", version = "2.3.0") +bazel_dep(name = "rules_cc", version = "0.2.17") # https://github.com/googleapis/googleapis/pull/855 # https://github.com/bazelbuild/bazel-central-registry/pull/1699 @@ -118,7 +112,7 @@ go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps") go_deps.from_file(go_mod = "//:go.mod") use_repo(go_deps, "com_github_google_go_cmp") -bazel_dep(name = "rules_java", version = "9.0.3") +bazel_dep(name = "rules_java", version = "9.6.1") # https://github.com/bazelbuild/rules_jvm_external/blob/master/docs/bzlmod.md bazel_dep(name = "rules_jvm_external", version = "6.9") @@ -146,9 +140,9 @@ use_repo(maven, "maven") bazel_dep(name = "rules_kotlin", version = "2.1.10") bazel_dep(name = "rules_perl", version = "0.5.0") bazel_dep(name = "rules_swift", version = "3.3.0") -bazel_dep(name = "rules_nodejs", version = "6.6.0") -bazel_dep(name = "aspect_rules_ts", version = "3.7.1") -bazel_dep(name = "aspect_bazel_lib", version = "2.21.2") +bazel_dep(name = "rules_nodejs", version = "6.7.3") +bazel_dep(name = "aspect_rules_ts", version = "3.8.6") +bazel_dep(name = "aspect_bazel_lib", version = "2.22.5") rules_ts_ext = use_extension( "@aspect_rules_ts//ts:extensions.bzl", @@ -158,13 +152,13 @@ rules_ts_ext = use_extension( rules_ts_ext.deps() use_repo(rules_ts_ext, "npm_typescript") -bazel_dep(name = "rules_scala", version = "7.1.6") +bazel_dep(name = "rules_scala", version = "7.2.4") scala_config = use_extension( "@rules_scala//scala/extensions:config.bzl", "scala_config", ) -scala_config.settings(scala_version = "2.13.17") +scala_config.settings(scala_version = "2.13.18") scala_deps = use_extension( "@rules_scala//scala/extensions:deps.bzl", diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index bff01d89..674a1e56 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -57,8 +57,7 @@ "https://bcr.bazel.build/modules/bazel_features/1.3.0/MODULE.bazel": "cdcafe83ec318cda34e02948e81d790aab8df7a929cec6f6969f13a489ccecd9", "https://bcr.bazel.build/modules/bazel_features/1.30.0/MODULE.bazel": "a14b62d05969a293b80257e72e597c2da7f717e1e69fa8b339703ed6731bec87", "https://bcr.bazel.build/modules/bazel_features/1.33.0/MODULE.bazel": "8b8dc9d2a4c88609409c3191165bccec0e4cb044cd7a72ccbe826583303459f6", - "https://bcr.bazel.build/modules/bazel_features/1.36.0/MODULE.bazel": "596cb62090b039caf1cad1d52a8bc35cf188ca9a4e279a828005e7ee49a1bec3", - "https://bcr.bazel.build/modules/bazel_features/1.36.0/source.json": "279625cafa5b63cc0a8ee8448d93bc5ac1431f6000c50414051173fd22a6df3c", + "https://bcr.bazel.build/modules/bazel_features/1.33.0/source.json": "13617db3930328c2cd2807a0f13d52ca870ac05f96db9668655113265147b2a6", "https://bcr.bazel.build/modules/bazel_features/1.4.1/MODULE.bazel": "e45b6bb2350aff3e442ae1111c555e27eac1d915e77775f6fdc4b351b758b5d7", "https://bcr.bazel.build/modules/bazel_features/1.9.0/MODULE.bazel": "885151d58d90d8d9c811eb75e3288c11f850e1d6b481a8c9f766adee4712358b", "https://bcr.bazel.build/modules/bazel_features/1.9.1/MODULE.bazel": "8f679097876a9b609ad1f60249c49d68bfab783dd9be012faf9d82547b14815a", @@ -235,17 +234,15 @@ "https://bcr.bazel.build/modules/protoc-gen-validate/1.2.1/MODULE.bazel": "52b51f50533ec4fbd5d613cd093773f979ac2e035d954e02ca11de383f502505", "https://bcr.bazel.build/modules/pybind11_bazel/2.11.1/MODULE.bazel": "88af1c246226d87e65be78ed49ecd1e6f5e98648558c14ce99176da041dc378e", "https://bcr.bazel.build/modules/pybind11_bazel/2.12.0/MODULE.bazel": "e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34", - "https://bcr.bazel.build/modules/pybind11_bazel/3.0.0/MODULE.bazel": "a2bfa6020ed603a00d944161c63173c7f109774e99bee0c2cd8dbf24159f8134", - "https://bcr.bazel.build/modules/pybind11_bazel/3.0.0/source.json": "d8f5104d4c21d272bf327ebe44366fb0b4c036cdaa1f5cceb21a408ca4ef2ef8", + "https://bcr.bazel.build/modules/pybind11_bazel/2.12.0/source.json": "6900fdc8a9e95866b8c0d4ad4aba4d4236317b5c1cd04c502df3f0d33afed680", "https://bcr.bazel.build/modules/rapidjson/1.1.0.bcr.20241007/MODULE.bazel": "82fbcb2e42f9e0040e76ccc74c06c3e46dfd33c64ca359293f8b84df0e6dff4c", "https://bcr.bazel.build/modules/rapidjson/1.1.0.bcr.20241007/source.json": "5c42389ad0e21fc06b95ad7c0b730008271624a2fa3292e0eab5f30e15adeee3", "https://bcr.bazel.build/modules/re2/2021-09-01/MODULE.bazel": "bcb6b96f3b071e6fe2d8bed9cc8ada137a105f9d2c5912e91d27528b3d123833", "https://bcr.bazel.build/modules/re2/2023-09-01/MODULE.bazel": "cb3d511531b16cfc78a225a9e2136007a48cf8a677e4264baeab57fe78a80206", "https://bcr.bazel.build/modules/re2/2024-05-01/MODULE.bazel": "55a3f059538f381107824e7d00df5df6d061ba1fb80e874e4909c0f0549e8f3e", "https://bcr.bazel.build/modules/re2/2024-07-02.bcr.1/MODULE.bazel": "b4963dda9b31080be1905ef085ecd7dd6cd47c05c79b9cdf83ade83ab2ab271a", + "https://bcr.bazel.build/modules/re2/2024-07-02.bcr.1/source.json": "2ff292be6ef3340325ce8a045ecc326e92cbfab47c7cbab4bd85d28971b97ac4", "https://bcr.bazel.build/modules/re2/2024-07-02/MODULE.bazel": "0eadc4395959969297cbcf31a249ff457f2f1d456228c67719480205aa306daa", - "https://bcr.bazel.build/modules/re2/2025-11-05.bcr.1/MODULE.bazel": "3d9d4995833fc0334fc5c88b56a05288dd25d651544cd7b2233bbd6357bbeba0", - "https://bcr.bazel.build/modules/re2/2025-11-05.bcr.1/source.json": "7df1394aabda1c9bc188a302f5d54b1c657924edd04ebc57d2be29dbd7efd141", "https://bcr.bazel.build/modules/rules_android/0.1.1/MODULE.bazel": "48809ab0091b07ad0182defb787c4c5328bd3a278938415c00a7b69b50c4d3a8", "https://bcr.bazel.build/modules/rules_android/0.6.4/MODULE.bazel": "b4cde12d506dd65d82b2be39761f49f5797303343a3d5b4ee191c0cdf9ef387c", "https://bcr.bazel.build/modules/rules_android/0.6.4/source.json": "95d3c233c81005ad95eadc9382fde7dc6bd2c61752361e463264ee8349c071fb", @@ -271,11 +268,9 @@ "https://bcr.bazel.build/modules/rules_cc/0.2.0/MODULE.bazel": "b5c17f90458caae90d2ccd114c81970062946f49f355610ed89bebf954f5783c", "https://bcr.bazel.build/modules/rules_cc/0.2.13/MODULE.bazel": "eecdd666eda6be16a8d9dc15e44b5c75133405e820f620a234acc4b1fdc5aa37", "https://bcr.bazel.build/modules/rules_cc/0.2.14/MODULE.bazel": "353c99ed148887ee89c54a17d4100ae7e7e436593d104b668476019023b58df8", - "https://bcr.bazel.build/modules/rules_cc/0.2.16/MODULE.bazel": "9242fa89f950c6ef7702801ab53922e99c69b02310c39fb6e62b2bd30df2a1d4", - "https://bcr.bazel.build/modules/rules_cc/0.2.16/source.json": "d03d5cde49376d87e14ec14b666c56075e5e3926930327fd5d0484a1ff2ac1cc", + "https://bcr.bazel.build/modules/rules_cc/0.2.14/source.json": "55d0a4587c5592fad350f6e698530f4faf0e7dd15e69d43f8d87e220c78bea54", "https://bcr.bazel.build/modules/rules_cc/0.2.4/MODULE.bazel": "1ff1223dfd24f3ecf8f028446d4a27608aa43c3f41e346d22838a4223980b8cc", "https://bcr.bazel.build/modules/rules_cc/0.2.8/MODULE.bazel": "f1df20f0bf22c28192a794f29b501ee2018fa37a3862a1a2132ae2940a23a642", - "https://bcr.bazel.build/modules/rules_cc/0.2.9/MODULE.bazel": "34263f1dca62ea664265438cef714d7db124c03e1ed55ebb4f1dc860164308d1", "https://bcr.bazel.build/modules/rules_dotnet/0.21.5/MODULE.bazel": "a4c0775561057593dd851c7f59f334336d73eb291eb9726e805d0466570bb0d7", "https://bcr.bazel.build/modules/rules_dotnet/0.21.5/source.json": "f7a44e6aacb939042b8c0e3e9819d745a05228a283db369299ecf714cbac5608", "https://bcr.bazel.build/modules/rules_foreign_cc/0.10.1/MODULE.bazel": "b9527010e5fef060af92b6724edb3691970a5b1f76f74b21d39f7d433641be60", @@ -318,8 +313,7 @@ "https://bcr.bazel.build/modules/rules_java/8.7.0/MODULE.bazel": "7670fc42983b91b30a7142bbd3595ff6593d2bff908bc100b2e838f223c0653a", "https://bcr.bazel.build/modules/rules_java/8.9.0/MODULE.bazel": "e17c876cb53dcd817b7b7f0d2985b710610169729e8c371b2221cacdcd3dce4a", "https://bcr.bazel.build/modules/rules_java/9.0.3/MODULE.bazel": "1f98ed015f7e744a745e0df6e898a7c5e83562d6b759dfd475c76456dda5ccea", - "https://bcr.bazel.build/modules/rules_java/9.1.0/MODULE.bazel": "ee63f27e36a3fada80342869361182f120a9819c74320e8e65b1e04ba0cd7a9d", - "https://bcr.bazel.build/modules/rules_java/9.1.0/source.json": "da589573c1dee2c9ac4a568b301269a2e8191110ff0345c1a959fa7ea6c4dfd6", + "https://bcr.bazel.build/modules/rules_java/9.0.3/source.json": "b038c0c07e12e658135bbc32cc1a2ded6e33785105c9d41958014c592de4593e", "https://bcr.bazel.build/modules/rules_jvm_external/5.2/MODULE.bazel": "d9351ba35217ad0de03816ef3ed63f89d411349353077348a45348b096615036", "https://bcr.bazel.build/modules/rules_jvm_external/5.3/MODULE.bazel": "bf93870767689637164657731849fb887ad086739bd5d360d90007a581d5527d", "https://bcr.bazel.build/modules/rules_jvm_external/6.0/MODULE.bazel": "37c93a5a78d32e895d52f86a8d0416176e915daabd029ccb5594db422e87c495", @@ -373,7 +367,6 @@ "https://bcr.bazel.build/modules/rules_python/0.40.0/MODULE.bazel": "9d1a3cd88ed7d8e39583d9ffe56ae8a244f67783ae89b60caafc9f5cf318ada7", "https://bcr.bazel.build/modules/rules_python/1.3.0/MODULE.bazel": "8361d57eafb67c09b75bf4bbe6be360e1b8f4f18118ab48037f2bd50aa2ccb13", "https://bcr.bazel.build/modules/rules_python/1.6.0/MODULE.bazel": "7e04ad8f8d5bea40451cf80b1bd8262552aa73f841415d20db96b7241bd027d8", - "https://bcr.bazel.build/modules/rules_python/1.6.3/MODULE.bazel": "a7b80c42cb3de5ee2a5fa1abc119684593704fcd2fec83165ebe615dec76574f", "https://bcr.bazel.build/modules/rules_python/1.7.0/MODULE.bazel": "d01f995ecd137abf30238ad9ce97f8fc3ac57289c8b24bd0bf53324d937a14f8", "https://bcr.bazel.build/modules/rules_python/1.7.0/source.json": "028a084b65dcf8f4dc4f82f8778dbe65df133f234b316828a82e060d81bdce32", "https://bcr.bazel.build/modules/rules_robolectric/4.14.1.2/MODULE.bazel": "d44fec647d0aeb67b9f3b980cf68ba634976f3ae7ccd6c07d790b59b87a4f251", @@ -426,6 +419,186 @@ }, "selectedYankedVersions": {}, "moduleExtensions": { + "@@aspect_rules_js+//npm:extensions.bzl%pnpm": { + "general": { + "bzlTransitiveDigest": "IXGzF0f+mCyPLrswS1JgWRNT9Vi/geDTGnMCsoVAVtg=", + "usagesDigest": "VcsfDFwmBt+ECaA/4/v9Ozpk8OnXWBpmy21oeFuDhZg=", + "recordedInputs": [ + "REPO_MAPPING:aspect_bazel_lib+,bazel_skylib bazel_skylib+", + "REPO_MAPPING:aspect_bazel_lib+,bazel_tools bazel_tools", + "REPO_MAPPING:aspect_rules_js+,aspect_bazel_lib aspect_bazel_lib+", + "REPO_MAPPING:aspect_rules_js+,bazel_features bazel_features+", + "REPO_MAPPING:aspect_rules_js+,bazel_skylib bazel_skylib+", + "REPO_MAPPING:aspect_rules_js+,bazel_tools bazel_tools", + "REPO_MAPPING:bazel_features+,bazel_features_globals bazel_features++version_extension+bazel_features_globals", + "REPO_MAPPING:bazel_features+,bazel_features_version bazel_features++version_extension+bazel_features_version" + ], + "generatedRepoSpecs": { + "pnpm": { + "repoRuleId": "@@aspect_rules_js+//npm/private:npm_import.bzl%npm_import_rule", + "attributes": { + "package": "pnpm", + "version": "8.6.7", + "root_package": "", + "link_workspace": "", + "link_packages": {}, + "integrity": "sha512-vRIWpD/L4phf9Bk2o/O2TDR8fFoJnpYrp2TKqTIZF/qZ2/rgL3qKXzHofHgbXsinwMoSEigz28sqk3pQ+yMEQQ==", + "url": "", + "commit": "", + "patch_args": [ + "-p0" + ], + "patches": [], + "custom_postinstall": "", + "npm_auth": "", + "npm_auth_basic": "", + "npm_auth_username": "", + "npm_auth_password": "", + "lifecycle_hooks": [], + "extra_build_content": "load(\"@aspect_rules_js//js:defs.bzl\", \"js_binary\")\njs_binary(name = \"pnpm\", data = glob([\"package/**\"]), entry_point = \"package/dist/pnpm.cjs\", visibility = [\"//visibility:public\"])", + "extract_full_archive": true, + "system_tar": "auto" + } + }, + "pnpm__links": { + "repoRuleId": "@@aspect_rules_js+//npm/private:npm_import.bzl%npm_import_links", + "attributes": { + "package": "pnpm", + "version": "8.6.7", + "dev": false, + "root_package": "", + "link_packages": {}, + "deps": {}, + "transitive_closure": {}, + "lifecycle_build_target": false, + "lifecycle_hooks_env": [], + "lifecycle_hooks_execution_requirements": [ + "no-sandbox" + ], + "lifecycle_hooks_use_default_shell_env": false, + "bins": {}, + "package_visibility": [ + "//visibility:public" + ] + } + } + } + } + }, + "@@aspect_rules_ts+//ts:extensions.bzl%ext": { + "general": { + "bzlTransitiveDigest": "vTiudHc7L99CVE4VkMx6074VEyMRxSGm5CB2dZN8jLY=", + "usagesDigest": "YFCF4Pe3ZMqh53Xb1GbuZYKE5Q121NDwst+POer5vxE=", + "recordedInputs": [ + "REPO_MAPPING:aspect_rules_ts+,aspect_rules_ts aspect_rules_ts+", + "REPO_MAPPING:aspect_rules_ts+,bazel_tools bazel_tools" + ], + "generatedRepoSpecs": { + "npm_typescript": { + "repoRuleId": "@@aspect_rules_ts+//ts/private:npm_repositories.bzl%http_archive_version", + "attributes": { + "version": "5.9.3", + "integrity": "", + "urls": [ + "https://registry.npmjs.org/typescript/-/typescript-{}.tgz" + ] + } + } + } + } + }, + "@@aspect_tools_telemetry+//:extension.bzl%telemetry": { + "general": { + "bzlTransitiveDigest": "gA7tPEdJXhskzPIEUxjX9IdDrM6+WjfbgXJ8Ez47umk=", + "usagesDigest": "i3ljOnENfG+jq0Nu7FV9VJ2kmSu/7gRS4rA+JOOHIQc=", + "recordedInputs": [ + "REPO_MAPPING:aspect_tools_telemetry+,aspect_bazel_lib aspect_bazel_lib+", + "REPO_MAPPING:aspect_tools_telemetry+,bazel_skylib bazel_skylib+" + ], + "generatedRepoSpecs": { + "aspect_tools_telemetry_report": { + "repoRuleId": "@@aspect_tools_telemetry+//:extension.bzl%tel_repository", + "attributes": { + "deps": { + "aspect_rules_ts": "3.7.1", + "aspect_tools_telemetry": "0.2.8" + } + } + } + } + } + }, + "@@envoy_api+//bazel:repositories.bzl%non_module_deps": { + "general": { + "bzlTransitiveDigest": "oD11lheuJMsIsrerbyv8hlRJTb4fYVpomeGW15xjoyo=", + "usagesDigest": "lOhJkV09ITWn6LOK9fLMuf1t3969wdr45lToQ2MVQoU=", + "recordedInputs": [ + "REPO_MAPPING:envoy_api+,bazel_tools bazel_tools", + "REPO_MAPPING:envoy_api+,envoy_api envoy_api+" + ], + "generatedRepoSpecs": { + "prometheus_metrics_model": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "urls": [ + "https://github.com/prometheus/client_model/archive/v0.6.2.tar.gz" + ], + "sha256": "47c5ea7949f68e7f7b344350c59b6bd31eeb921f0eec6c3a566e27cf1951470c", + "strip_prefix": "client_model-0.6.2", + "build_file_content": "\nload(\"@envoy_api//bazel:api_build_system.bzl\", \"api_cc_py_proto_library\")\nload(\"@io_bazel_rules_go//proto:def.bzl\", \"go_proto_library\")\n\napi_cc_py_proto_library(\n name = \"client_model\",\n srcs = [\n \"io/prometheus/client/metrics.proto\",\n ],\n visibility = [\"//visibility:public\"],\n)\n\ngo_proto_library(\n name = \"client_model_go_proto\",\n importpath = \"github.com/prometheus/client_model/go\",\n proto = \":client_model\",\n visibility = [\"//visibility:public\"],\n)\n" + } + } + } + } + }, + "@@googleapis+//:extensions.bzl%switched_rules": { + "general": { + "bzlTransitiveDigest": "1ZTg77R3Ks/ksx8QMNIoTRJetbJPRlzGFlJa9hoUn+Y=", + "usagesDigest": "4qqLlQt9ukbtcljUbNd31KFkYT16jA3KGb6yYAFv+o4=", + "recordedInputs": [], + "generatedRepoSpecs": {} + } + }, + "@@pybind11_bazel+//:internal_configure.bzl%internal_configure_extension": { + "general": { + "bzlTransitiveDigest": "06cynZ1bCvvy8zHPrrDlXq+Z68xmjctHpfFxi+zEpJY=", + "usagesDigest": "D1r3lfzMuUBFxgG8V6o0bQTLMk3GkaGOaPzw53wrwyw=", + "recordedInputs": [ + "REPO_MAPPING:pybind11_bazel+,bazel_tools bazel_tools", + "FILE:@@pybind11_bazel+//MODULE.bazel e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34" + ], + "generatedRepoSpecs": { + "pybind11": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "build_file": "@@pybind11_bazel+//:pybind11-BUILD.bazel", + "strip_prefix": "pybind11-2.12.0", + "urls": [ + "https://github.com/pybind/pybind11/archive/v2.12.0.zip" + ] + } + } + } + } + }, + "@@rules_android+//bzlmod_extensions:apksig.bzl%apksig_extension": { + "general": { + "bzlTransitiveDigest": "KrgiB8lWxqVdbipL9YIYOuGjS80xlZIM/EBvUg8SVd0=", + "usagesDigest": "0FXD4PX+vQ/jVne2oV4v3Cw5Mc9DZQ4yTcoRkAjj/X4=", + "recordedInputs": [ + "REPO_MAPPING:rules_android+,bazel_tools bazel_tools" + ], + "generatedRepoSpecs": { + "apksig": { + "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive", + "attributes": { + "url": "https://android.googlesource.com/platform/tools/apksig/+archive/24e3075e68ebe17c0b529bb24bfda819db5e2f3b.tar.gz", + "build_file": "@@rules_android+//bzlmod_extensions:apksig.BUILD" + } + } + } + } + }, "@@rules_android+//rules/android_sdk_repository:rule.bzl%android_sdk_repository_extension": { "general": { "bzlTransitiveDigest": "NAy+0M15JNVEBb8Tny6t7j3lKqTnsAMjoBB6LJ+C370=", @@ -677,7 +850,7 @@ }, "@@rules_python+//python/extensions:config.bzl%config": { "general": { - "bzlTransitiveDigest": "xTQL2WwSnk5sODEM8aZ7ehfwglUBBCNKWIvS4z7M59w=", + "bzlTransitiveDigest": "2hLgIvNVTLgxus0ZuXtleBe70intCfo0cHs8qvt6cdM=", "usagesDigest": "ZVSXMAGpD+xzVNPuvF1IoLBkty7TROO0+akMapt1pAg=", "recordedInputs": [ "REPO_MAPPING:rules_python+,bazel_tools bazel_tools", diff --git a/scala/0001-protobuf-19679-rm-protoc-dep.patch b/scala/0001-protobuf-19679-rm-protoc-dep.patch deleted file mode 100644 index 86d7d1b8..00000000 --- a/scala/0001-protobuf-19679-rm-protoc-dep.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/protobuf.bzl b/protobuf.bzl -index 283c85850..ad91faba6 100644 ---- a/protobuf.bzl -+++ b/protobuf.bzl -@@ -1,7 +1,9 @@ - load("@bazel_skylib//lib:versions.bzl", "versions") - load("@rules_cc//cc:defs.bzl", "objc_library") - load("@rules_python//python:defs.bzl", "py_library") -+load("//bazel/common:proto_common.bzl", "proto_common") - load("//bazel/common:proto_info.bzl", "ProtoInfo") -+load("//bazel/private:toolchain_helpers.bzl", "toolchains") - - def _GetPath(ctx, path): - if ctx.label.workspace_root: -@@ -71,6 +73,26 @@ def _CsharpOuts(srcs): - for src in srcs - ] - -+_PROTOC_ATTRS = toolchains.if_legacy_toolchain({ -+ "_proto_compiler": attr.label( -+ cfg = "exec", -+ executable = True, -+ allow_files = True, -+ default = configuration_field("proto", "proto_compiler"), -+ ), -+}) -+_PROTOC_FRAGMENTS = ["proto"] -+_PROTOC_TOOLCHAINS = toolchains.use_toolchain(toolchains.PROTO_TOOLCHAIN) -+ -+def _protoc_files_to_run(ctx): -+ if proto_common.INCOMPATIBLE_ENABLE_PROTO_TOOLCHAIN_RESOLUTION: -+ toolchain = ctx.toolchains[toolchains.PROTO_TOOLCHAIN] -+ if not toolchain: -+ fail("Protocol compiler toolchain could not be resolved.") -+ return toolchain.proto.proto_compiler -+ else: -+ return ctx.attr._proto_compiler[DefaultInfo].files_to_run -+ - ProtoGenInfo = provider( - fields = ["srcs", "import_flags", "deps"], - ) -@@ -310,7 +332,7 @@ def _internal_gen_well_known_protos_java_impl(ctx): - args.add_all([src.path[offset:] for src in dep.direct_sources]) - - ctx.actions.run( -- executable = ctx.executable._protoc, -+ executable = _protoc_files_to_run(ctx), - inputs = descriptors, - outputs = [srcjar], - arguments = [args], -@@ -334,12 +356,9 @@ internal_gen_well_known_protos_java = rule( - "javalite": attr.bool( - default = False, - ), -- "_protoc": attr.label( -- executable = True, -- cfg = "exec", -- default = "//:protoc", -- ), -- }, -+ } | _PROTOC_ATTRS, -+ fragments = _PROTOC_FRAGMENTS, -+ toolchains = _PROTOC_TOOLCHAINS, - ) - - def _internal_gen_kt_protos(ctx): -@@ -373,7 +392,7 @@ def _internal_gen_kt_protos(ctx): - args.add_all([src.path[offset:] for src in dep.direct_sources]) - - ctx.actions.run( -- executable = ctx.executable._protoc, -+ executable = _protoc_files_to_run(ctx), - inputs = descriptors, - outputs = [srcjar], - arguments = [args], -@@ -397,12 +416,9 @@ internal_gen_kt_protos = rule( - "lite": attr.bool( - default = False, - ), -- "_protoc": attr.label( -- executable = True, -- cfg = "exec", -- default = "//:protoc", -- ), -- }, -+ } | _PROTOC_ATTRS, -+ fragments = _PROTOC_FRAGMENTS, -+ toolchains = _PROTOC_TOOLCHAINS, - ) - - def internal_objc_proto_library(