diff --git a/.bazelignore b/.bazelignore index 324083a11..f159e245c 100644 --- a/.bazelignore +++ b/.bazelignore @@ -2,6 +2,7 @@ # - bazelbuild/bazel: Loading top-level targets in local_path_override modules # in child directory breaks the build #22208 # https://github.com/bazelbuild/bazel/issues/22208 +deps/ dt_patches/compiler_sources dt_patches/test_dt_patches dt_patches/test_dt_patches_user_srcjar diff --git a/.gitignore b/.gitignore index ce630e21d..74a9a64ad 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,6 @@ repository-artifacts.json # Used by some tests, but can also be used for local experimentation. tmp/ + +# Not required by tests. +deps/latest/.bazelversion diff --git a/MODULE.bazel b/MODULE.bazel index e8e68f7d6..e38620402 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -3,7 +3,7 @@ module( name = "rules_scala", version = "7.0.0", - bazel_compatibility = [">=7.5.0"], + bazel_compatibility = [">=7.1.0"], compatibility_level = 7, ) @@ -26,15 +26,33 @@ SCALA_3_VERSIONS = [ SCALA_VERSIONS = SCALA_2_VERSIONS + SCALA_3_VERSIONS -bazel_dep(name = "bazel_skylib", version = "1.7.1") -bazel_dep(name = "platforms", version = "0.0.11") -bazel_dep(name = "rules_cc", version = "0.1.1") -bazel_dep(name = "abseil-cpp", version = "20250127.1") -bazel_dep(name = "rules_java", version = "8.11.0") -bazel_dep(name = "rules_proto", version = "7.1.0") +bazel_dep(name = "bazel_skylib", version = "1.6.0") +single_version_override( + module_name = "bazel_skylib", + version = "1.7.1", +) + +bazel_dep(name = "platforms", version = "0.0.9") +single_version_override( + module_name = "platforms", + version = "0.0.11", +) + +bazel_dep(name = "rules_java", version = "7.6.0") +single_version_override( + module_name = "rules_java", + version = "8.11.0", +) + +bazel_dep(name = "rules_proto", version = "6.0.0") +single_version_override( + module_name = "rules_proto", + version = "7.1.0", +) + bazel_dep( name = "protobuf", - version = "30.1", + version = "28.2", repo_name = "com_google_protobuf", ) @@ -44,7 +62,7 @@ single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//protoc:0001-protobuf-19679-rm-protoc-dep.patch"], - version = "30.1", + version = "30.2", ) scala_protoc = use_extension( diff --git a/README.md b/README.md index 1e267614f..8526c1d43 100644 --- a/README.md +++ b/README.md @@ -112,14 +112,14 @@ register_toolchains( # compiler" section below. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) ``` @@ -171,6 +171,21 @@ http_archive( url = "https://github.com/bazelbuild/rules_scala/releases/download//rules_scala-.tar.gz", ) +# This imports the minimum versions supported by the minimum supported Bazel +# version, plus `rules_java` 8.5.0. If you use `rules_java` 7 or an earlier +# `rules_java` 8 version, the corresponding `load` statements are slightly +# different. See the `WORKSPACE` snippet from +# https://github.com/bazelbuild/rules_java/releases corresponding to the +# `rules_java` version for details. +# +# Also, this imports `rules_proto` 6.0.2, though 6.0.0 will work. This is +# because the `WORKSPACE` snippets for different versions of `rules_proto` vary +# somewhat, and the 6.0.2 snippet works with the latest version. See +# https://github.com/bazelbuild/rules_proto/releases for the corresponding +# `rules_proto` release for details. +# +# If you want the latest dependency versions, change `deps.bzl` to +# `latest_deps.bzl`. load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() @@ -238,7 +253,8 @@ rules_proto_toolchains() # Include this after loading `platforms`, `com_google_protobuf`, and # `rules_proto` to enable the `//protoc` precompiled protocol compiler -# toolchains. See the "Using a precompiled protocol compiler" section below. +# toolchains. Requires at least `protobuf` v29.0. See the "Using a precompiled +# protocol compiler" section below. load("@rules_scala//protoc:toolchains.bzl", "scala_protoc_toolchains") # This name can be anything, but we recommend `rules_scala_protoc_toolchains`. @@ -318,10 +334,11 @@ load( ### Using a precompiled protocol compiler `rules_scala` now supports the -[`--incompatible_enable_proto_toolchain_resolution`][] flag when using -[protobuf v29 or later](#why-proto-v29). When using this flag with the -`MODULE.bazel` or `WORKSPACE` configurations below, `rules_scala` will use a -precompiled protocol compiler binary by default. +[`--incompatible_enable_proto_toolchain_resolution`][] flag when using [protobuf +v29 or later](#why-proto-v29) with the minimum dependency versions specified +below. When using this flag with the `MODULE.bazel` or `WORKSPACE` +configurations below, `rules_scala` will use a precompiled protocol compiler +binary by default. [`--incompatible_enable_proto_toolchain_resolution`]: https://bazel.build/reference/command-line-reference#flag--incompatible_enable_proto_toolchain_resolution @@ -329,11 +346,29 @@ __Windows builds now require using `protobuf` v29 or later with the precompiled protocol compiler toolchain.__ See the [Windows MSVC builds of protobuf broken by default](#protoc-msvc) section below for details. +#### Minimum dependency versions + +These are the minimum dependency versions required to enable the precompiled +protocol compiler toolchain. + +Note that `rules_java` can be as low as 8.3.0, compared to `rules_java` 8.5.0 +specified in [Compatible Bazel versions](#compatible-bazel-versions). + +| Dependency | Minimum version | Reason | +| :-: | :-: | :- | +| `protobuf` | v29.0 | See the [Why this requires 'protobuf' v29 or later](#why-proto-v29) section.| +| Bazel | 7.1.0 (with `rules_java` 7.10.0, 8.3.2)
7.3.2 (with `rules_java` 8.3.0) | `module(bazel_compatibility = "...")` constraints in `MODULE.bazel` | +| `platforms` | 0.0.9 | Creates the `@host_platform` repo used to auto-detect the toolchain for the host platform. | +| `rules_java` | 7.10.0 (with `--experimental_google_legacy_api`), 8.3.0 | `protobuf` v29 needs 7.8.0 with `--experimental_google_legacy_api` for `ProguardSpecProvider`. Then it needs 7.10.0 for `//java/private:proto_support.bzl` visibility.
`protobuf` v29 needs `@rules_java//java/private:proto_support.bzl` from v8.2.0. See [bazelbuild/rules_java@94d5617](https://github.com/bazelbuild/rules_java/commit/94d5617cf3d97ddda10c81ba05a865e8e3a0408e).
v8.3.0 fixes bazelbuild/rules_java#233. | +| `rules_proto` | 7.0.0 | Required by `protobuf` v29 and later. | +| `bazel_skylib` | 1.7.0 | Contains `paths.is_normalized`, required by `//bazel/private:bazel_proto_library_rule.bzl` in `protobuf` v29. See [bazelbuild/bazel-skylib@0e485c8](https://github.com/bazelbuild/bazel-skylib/commit/0e485c80b7992f5ebfab50637f86e966f544ad58). | + #### Common setup To set the flag in your `.bazelrc` file: ```txt +# .bazelrc common --incompatible_enable_proto_toolchain_resolution ``` @@ -455,20 +490,21 @@ package of your repository, add the following to your `MODULE.bazel`: # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) ``` #### `protobuf` patch setup under `WORKSPACE` -[`scala/deps.bzl`](./scala/deps.bzl) currently applies the `protobuf` patch to `protobuf` v30.1. +[`scala/latest-deps.bzl`](./scala/latest-deps.bzl) currently applies the +`protobuf` patch to `protobuf` v30.2. If you need to apply the patch to a different version of `protobuf`, copy it to your repo as described in the Bzlmod setup above. Then apply it in your own @@ -477,9 +513,9 @@ your repo as described in the Bzlmod setup above. Then apply it in your own ```py http_archive( name = "com_google_protobuf", - sha256 = "1451b03faec83aed17cdc71671d1bbdfd72e54086b827f5f6fd02bf7a4041b68", - strip_prefix = "protobuf-30.1", - url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v30.1.tar.gz", + sha256 = "07a43d88fe5a38e434c7f94129cad56a4c43a51f99336074d0799c2f7d4e44c5", + strip_prefix = "protobuf-30.2", + url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v30.2.tar.gz", repo_mapping = {"@com_google_absl": "@abseil-cpp"}, patches = ["//protobuf.patch"], patch_args = ["-p1"], @@ -633,8 +669,8 @@ Bazel and `rules_java`, and their compatibility with [scalapb/ScalaPB]( https://github.com/scalapb/ScalaPB) Maven artifacts. For extensive analysis, see bazelbuild/rules_scala#1647. -The Bazel versions and dependency versions in the table below represent the -maximum available at the time of writing. +The Bazel versions and dependency versions below represent the minimum versions +compatible with `rules_scala` 7.x. - For the actual versions used by `rules_scala`, see [MODULE.bazel](./MODULE.bazel). @@ -642,15 +678,22 @@ maximum available at the time of writing. - See [.bazelci/presubmit.yml](./.bazelci/presubmit.yml) for the exact Bazel versions verified by the continuous integration builds. -| Bazel/Dependency | `rules_scala` 7.x | +| Mode | Supported Bazel versions | | :-: | :-: | -| Bazel versions using Bzlmod
(Coming soon! See bazelbuild/rules_scala#1482.) | 7.6.0, 8.x,
`rolling`, `last_green` | -| Bazel versions using `WORKSPACE` | 6.5.0, 7.6.0, 8.x
(see the [notes on 6.5.0 compatibility](#6.5.0)) | -| `protobuf` | v30.1 | -| `rules_proto` | 7.1.0 | -| `abseil-cpp` | 20250127.1 | -| `rules_java` | 8.11.0 | -| `ScalaPB` | 1.0.0-alpha.1 | +| Bzlmod
(Coming soon! See bazelbuild/rules_scala#1482.) | >= 7.1.0, 8.x,
`rolling`, `last_green` | +| `WORKSPACE` | 6.5.0, >= 7.1.0, 8.x
(see the [notes on 6.5.0 compatibility](#6.5.0)) | + +`rules_scala` 7.0.0 uses `ScalaPB` 1.0.0-alpha.1 to support `protobuf` v28.2 and +later, required by newer Bazel versions and other dependencies. Below are the +minimum versions of `protobuf` and related dependencies supported for Bazel 7 +and 8. + +| Dependency | Bazel >= 7.1.0 | Bazel 8.x | +| :--------: | :------------: | :-------: | +| `bazel_skylib` | 1.6.0 | 1.7.0 | +| `protobuf` | v28.2 | v29.0 | +| `rules_java` | 7.6.0, 8.4.0 | 8.5.0 | +| `rules_proto` | 6.0.0 | 7.0.0 | The next major release will likely drop support for `protobuf` versions before v29 and remove `rules_proto` completely. This is to comply with the guidance in @@ -662,7 +705,8 @@ https://github.com/bazelbuild/rules_scala/pull/1710#issuecomment-2750001012). ### Using a prebuilt `@com_google_protobuf//:protoc` or C++ compiler flags Newer versions of `abseil-cpp`, required by newer versions of -`@com_google_protobuf//:protoc`, fail to compile under Bazel 6.5.0 and 7.6.0 by +`@com_google_protobuf//:protoc`, fail to compile under Bazel 6.5.0 by default. +The latest versions of `abseil-cpp` also fail to compile under Bazel 7 by default. [protoc will also fail to build on Windows when using MSVC](#protoc-msvc). You will have to choose one of the following approaches to resolve this problem. @@ -1112,25 +1156,25 @@ supporting Bazel + MSVC builds per: Enable [protocol compiler toolchainization](#protoc) to fix broken Windows builds by avoiding `@com_google_protobuf//:protoc` recompilation. -### Minimum of `protobuf` v28 +### Minimum of `protobuf` v28.2 -`rules_scala` requires at least `protobuf` v28, and at least v29 for [protocol +`rules_scala` requires at least `protobuf` v28.2, and at least v29 for [protocol compiler toolchain](#protoc) support. No `ScalaPB` release supports `protobuf` v25.6, v26, or v27. #### Using earlier `protobuf` versions -If you can't update to `protobuf` v28 or later right now, build using Bazel 7 +If you can't update to `protobuf` v28.2 or later right now, build using Bazel 7 and the following maximum versions of key dependencies. This is not officially supported, but should work for some time. | Dependency | Max compatible version | Reason | | :-: | :-: | :- | +| `ScalaPB` | 0.11.17
(0.9.8 for Scala 2.11) | Later versions only support `protobuf` >= v28.2. | | `protobuf` | v25.5 | Maximum version supported by `ScalaPB` 0.11.17. | -| `rules_proto` | 6.0.2 | Maximum version supporting `protobuf` v25.5 | -| `rules_java` | 7.12.4 | 8.x requires `protobuf` v27 and later. | | `rules_cc` | 0.0.9 | 0.0.10 requires Bazel 7 to define `CcSharedLibraryHintInfo`.
0.0.13 requires at least `protobuf` v27.0. | -| `ScalaPB` | 0.11.17
(0.9.8 for Scala 2.11) | Later versions only support `protobuf` >= v28. | +| `rules_java` | 7.12.5 | 8.x requires `protobuf` v27 and later. | +| `rules_proto` | 6.0.2 | Maximum version supporting `protobuf` v25.5 | ### Embedded resource paths no longer begin with `external/` diff --git a/WORKSPACE b/WORKSPACE index 4eec14db4..0fdf29802 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -1,7 +1,7 @@ workspace(name = "rules_scala") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -load("//scala:deps.bzl", "rules_scala_dependencies") +load("//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/deps/latest/MODULE.bazel b/deps/latest/MODULE.bazel new file mode 100644 index 000000000..eff3c2a06 --- /dev/null +++ b/deps/latest/MODULE.bazel @@ -0,0 +1,18 @@ +"""Bazel module defining the latest available dependency versions.""" + +module( + name = "latest_dependencies", + version = "0.0.0", + bazel_compatibility = [">=7.1.0"], +) + +bazel_dep(name = "bazel_skylib", version = "1.7.1") +bazel_dep(name = "platforms", version = "0.0.11") +bazel_dep(name = "protobuf", version = "30.2") +bazel_dep(name = "rules_java", version = "8.11.0") +bazel_dep(name = "rules_proto", version = "7.1.0") + +# https://github.com/bazelbuild/bazel/pull/25681 removed +# `bazel_tools/tools/cpp/osx_cc_wrapper.sh.tpl` in the `last_green` Bazel as of +# 2025-04-08. At least `test_cross_build` breaks without this. +bazel_dep(name = "rules_cc", version = "0.1.1") diff --git a/dt_patches/test_dt_patches/MODULE.bazel b/dt_patches/test_dt_patches/MODULE.bazel index 19e2633e9..82aaef1b9 100644 --- a/dt_patches/test_dt_patches/MODULE.bazel +++ b/dt_patches/test_dt_patches/MODULE.bazel @@ -8,6 +8,12 @@ local_path_override( path = "../..", ) +bazel_dep(name = "latest_dependencies") +local_path_override( + module_name = "latest_dependencies", + path = "../../deps/latest", +) + scala_config = use_extension( "@rules_scala//scala/extensions:config.bzl", "scala_config", @@ -70,12 +76,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) diff --git a/dt_patches/test_dt_patches/WORKSPACE b/dt_patches/test_dt_patches/WORKSPACE index 494280c23..1fad1c9e9 100644 --- a/dt_patches/test_dt_patches/WORKSPACE +++ b/dt_patches/test_dt_patches/WORKSPACE @@ -7,7 +7,7 @@ local_repository( path = "../..", ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel b/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel index ee8791129..e1524480b 100644 --- a/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel +++ b/dt_patches/test_dt_patches_user_srcjar/MODULE.bazel @@ -8,6 +8,12 @@ local_path_override( path = "../..", ) +bazel_dep(name = "latest_dependencies") +local_path_override( + module_name = "latest_dependencies", + path = "../../deps/latest", +) + scala_config = use_extension( "@rules_scala//scala/extensions:config.bzl", "scala_config", @@ -182,12 +188,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) diff --git a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE index 146531282..9ab21b28d 100644 --- a/dt_patches/test_dt_patches_user_srcjar/WORKSPACE +++ b/dt_patches/test_dt_patches_user_srcjar/WORKSPACE @@ -7,7 +7,7 @@ local_repository( path = "../..", ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/examples/crossbuild/MODULE.bazel b/examples/crossbuild/MODULE.bazel index 07b6ab4b2..dbec1a99d 100644 --- a/examples/crossbuild/MODULE.bazel +++ b/examples/crossbuild/MODULE.bazel @@ -8,6 +8,12 @@ local_path_override( path = "../..", ) +bazel_dep(name = "latest_dependencies") +local_path_override( + module_name = "latest_dependencies", + path = "../../deps/latest", +) + scala_config = use_extension( "@rules_scala//scala/extensions:config.bzl", "scala_config", @@ -49,12 +55,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) diff --git a/examples/crossbuild/WORKSPACE b/examples/crossbuild/WORKSPACE index 1ead7a66e..d3fd821dd 100644 --- a/examples/crossbuild/WORKSPACE +++ b/examples/crossbuild/WORKSPACE @@ -7,7 +7,7 @@ local_repository( path = "../..", ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/examples/overridden_artifacts/MODULE.bazel b/examples/overridden_artifacts/MODULE.bazel index 4a4b466ba..a7d064e88 100644 --- a/examples/overridden_artifacts/MODULE.bazel +++ b/examples/overridden_artifacts/MODULE.bazel @@ -8,6 +8,12 @@ local_path_override( path = "../..", ) +bazel_dep(name = "latest_dependencies") +local_path_override( + module_name = "latest_dependencies", + path = "../../deps/latest", +) + scala_config = use_extension( "@rules_scala//scala/extensions:config.bzl", "scala_config", @@ -74,12 +80,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) diff --git a/examples/overridden_artifacts/WORKSPACE b/examples/overridden_artifacts/WORKSPACE index 3c821e8a6..6650414c9 100644 --- a/examples/overridden_artifacts/WORKSPACE +++ b/examples/overridden_artifacts/WORKSPACE @@ -7,7 +7,7 @@ local_repository( path = "../..", ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/examples/scala3/MODULE.bazel b/examples/scala3/MODULE.bazel index 4670f4e31..aaa48d1fd 100644 --- a/examples/scala3/MODULE.bazel +++ b/examples/scala3/MODULE.bazel @@ -8,6 +8,12 @@ local_path_override( path = "../..", ) +bazel_dep(name = "latest_dependencies") +local_path_override( + module_name = "latest_dependencies", + path = "../../deps/latest", +) + scala_deps = use_extension( "@rules_scala//scala/extensions:deps.bzl", "scala_deps", @@ -33,12 +39,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) diff --git a/examples/scala3/WORKSPACE b/examples/scala3/WORKSPACE index 2f9f3da95..de41f219a 100644 --- a/examples/scala3/WORKSPACE +++ b/examples/scala3/WORKSPACE @@ -7,7 +7,7 @@ local_repository( path = "../..", ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/examples/semanticdb/MODULE.bazel b/examples/semanticdb/MODULE.bazel index f67f8e214..b2090414b 100644 --- a/examples/semanticdb/MODULE.bazel +++ b/examples/semanticdb/MODULE.bazel @@ -8,6 +8,12 @@ local_path_override( path = "../..", ) +bazel_dep(name = "latest_dependencies") +local_path_override( + module_name = "latest_dependencies", + path = "../../deps/latest", +) + scala_config = use_extension( "@rules_scala//scala/extensions:config.bzl", "scala_config", @@ -43,12 +49,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) diff --git a/examples/semanticdb/WORKSPACE b/examples/semanticdb/WORKSPACE index 2e83f2ef2..5bb7b0617 100644 --- a/examples/semanticdb/WORKSPACE +++ b/examples/semanticdb/WORKSPACE @@ -7,7 +7,7 @@ local_repository( path = "../..", ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/examples/testing/multi_frameworks_toolchain/MODULE.bazel b/examples/testing/multi_frameworks_toolchain/MODULE.bazel index b5a104943..54971da9c 100644 --- a/examples/testing/multi_frameworks_toolchain/MODULE.bazel +++ b/examples/testing/multi_frameworks_toolchain/MODULE.bazel @@ -12,6 +12,12 @@ local_path_override( path = "../../..", ) +bazel_dep(name = "latest_dependencies") +local_path_override( + module_name = "latest_dependencies", + path = "../../../deps/latest", +) + scala_config = use_extension( "@rules_scala//scala/extensions:config.bzl", "scala_config", @@ -83,12 +89,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) diff --git a/examples/testing/multi_frameworks_toolchain/WORKSPACE b/examples/testing/multi_frameworks_toolchain/WORKSPACE index cb0dc2a66..2cc282e17 100644 --- a/examples/testing/multi_frameworks_toolchain/WORKSPACE +++ b/examples/testing/multi_frameworks_toolchain/WORKSPACE @@ -7,7 +7,7 @@ local_repository( path = "../../..", ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/examples/testing/scalatest_repositories/MODULE.bazel b/examples/testing/scalatest_repositories/MODULE.bazel index 556dd858c..a67f16384 100644 --- a/examples/testing/scalatest_repositories/MODULE.bazel +++ b/examples/testing/scalatest_repositories/MODULE.bazel @@ -8,6 +8,12 @@ local_path_override( path = "../../..", ) +bazel_dep(name = "latest_dependencies") +local_path_override( + module_name = "latest_dependencies", + path = "../../../deps/latest", +) + scala_deps = use_extension( "@rules_scala//scala/extensions:deps.bzl", "scala_deps", @@ -35,12 +41,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) diff --git a/examples/testing/scalatest_repositories/WORKSPACE b/examples/testing/scalatest_repositories/WORKSPACE index 7f73713a0..2fe535a55 100644 --- a/examples/testing/scalatest_repositories/WORKSPACE +++ b/examples/testing/scalatest_repositories/WORKSPACE @@ -7,7 +7,7 @@ local_repository( path = "../../..", ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/examples/testing/specs2_junit_repositories/MODULE.bazel b/examples/testing/specs2_junit_repositories/MODULE.bazel index 43ad734c7..d7eaf5dd6 100644 --- a/examples/testing/specs2_junit_repositories/MODULE.bazel +++ b/examples/testing/specs2_junit_repositories/MODULE.bazel @@ -8,6 +8,12 @@ local_path_override( path = "../../..", ) +bazel_dep(name = "latest_dependencies") +local_path_override( + module_name = "latest_dependencies", + path = "../../../deps/latest", +) + scala_deps = use_extension( "@rules_scala//scala/extensions:deps.bzl", "scala_deps", @@ -35,12 +41,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) diff --git a/examples/testing/specs2_junit_repositories/WORKSPACE b/examples/testing/specs2_junit_repositories/WORKSPACE index 82aef5123..d1d5b5a9b 100644 --- a/examples/testing/specs2_junit_repositories/WORKSPACE +++ b/examples/testing/specs2_junit_repositories/WORKSPACE @@ -7,7 +7,7 @@ local_repository( path = "../../..", ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/protoc/private/protoc_integrity.bzl b/protoc/private/protoc_integrity.bzl index bfb66e4d7..6862dbb1a 100644 --- a/protoc/private/protoc_integrity.bzl +++ b/protoc/private/protoc_integrity.bzl @@ -10,6 +10,7 @@ PROTOC_DOWNLOAD_URL = ( ) PROTOC_VERSIONS = [ + "30.2", "30.1", "30.0", "29.3", @@ -25,6 +26,7 @@ PROTOC_BUILDS = { "@platforms//cpu:aarch64", ], "integrity": { + "30.2": "sha256-oxc+ozjvkbFgW4jE+BINbIzPNvdE2QgZkdWV0NQ1KZY=", "30.1": "sha256-6GbT3Ed16AMnIZFeg+P7bhq03vcZmkm0+VxNH2z0wDo=", "30.0": "sha256-WrNHtx+4qHE5zsNqrEvQ7jrD9PKvn8aOvfVW4cCmZcY=", "29.3": "sha256-ZCc0kUDgHwbgSecHpYcJpPIhrnOrmgQlvEoAyNDhqzI=", @@ -39,6 +41,7 @@ PROTOC_BUILDS = { "@platforms//cpu:ppc64le", ], "integrity": { + "30.2": "sha256-6eTFvQF5CNxmeBg1egQkceyYVVkTBDWA0kBmFnjdhLM=", "30.1": "sha256-QvDGG3d9y7nSMb+ty43iz/vgYl4WFH2+oOdmeFpB60Q=", "30.0": "sha256-yWGN4tFeIPFn0yaozAed/R8ETAVeDIv7eJ428guEktM=", "29.3": "sha256-DpiU7C45krFNGD586sFkZdam7nPh0jRpXYDm0elHAUw=", @@ -53,6 +56,7 @@ PROTOC_BUILDS = { "@platforms//cpu:s390x", ], "integrity": { + "30.2": "sha256-1ZBHfuHW4rgQhWt3InNC+yw5GTF4bIXtEqPMdB1Zl08=", "30.1": "sha256-orgjHBFZsAushwtu1OFs6dXSsImg4OkW/fPXCJNiC7Y=", "30.0": "sha256-eYcU19uRFfTgQr6G3R7quXNG31Qxof4QFhXJwcHhZM8=", "29.3": "sha256-Y3hX/bqwsTNL2ysIcz8L5JaF5pMBG2EEgJSRrGL71NU=", @@ -67,6 +71,7 @@ PROTOC_BUILDS = { "@platforms//cpu:x86_32", ], "integrity": { + "30.2": "sha256-wnMIeW55RbNqcd3rvR5R8lP2MjVdgwkTQktUwDx3MsY=", "30.1": "sha256-L5oRdIK9EripNAwhJ9iHefTdo7ZLTacJJ43EmaQ6c4Y=", "30.0": "sha256-OtMQ/NwrS/nzD1QrWbQDsrebqCss9DGb6E3poCZFrnY=", "29.3": "sha256-VGzx5pHOc/ZuKZzCLN1aF8YaEf5LbV34UHUHg4nx/Ck=", @@ -81,6 +86,7 @@ PROTOC_BUILDS = { "@platforms//cpu:x86_64", ], "integrity": { + "30.2": "sha256-Mn6Tl8b7PqKlQlE6MiEzTG9296pSSn0lYRQrZ7MSoB8=", "30.1": "sha256-VTfhWrDA5hD4CVc5SNPsfW7zh6B5keHDYaKg6MrZg+U=", "30.0": "sha256-L7vBgYRj1+bZPBmo3qg55mPKX4V5pS73jHaIGIM1+mw=", "29.3": "sha256-PoZmIMW+J2ZPPS+i1la18+CbUVK0Lxvtv0J7Mz6QAho=", @@ -95,6 +101,7 @@ PROTOC_BUILDS = { "@platforms//cpu:aarch64", ], "integrity": { + "30.2": "sha256-knKMZQ9s8rbDeJGuBO9bwtS18yxfu9EB7aYj+Qu5X2M=", "30.1": "sha256-A0Z8/ZZ94SphQGt0c+gCBNOuOPMPgoVTGBhtaWI347k=", "30.0": "sha256-frW1HTe6xBC6cO+RxAT5Cx+ry4I3Ev9lZYLTSsyHynQ=", "29.3": "sha256-K4o0A80Jf5XzumVuFLdscytrJtfxgzMLEeNu8rwCh2U=", @@ -109,6 +116,7 @@ PROTOC_BUILDS = { "@platforms//cpu:x86_64", ], "integrity": { + "30.2": "sha256-ZWdcO7h0otXwyUHmG85hdQkL4l/kZvDsLUpvWXgzNiQ=", "30.1": "sha256-pK7v0vWczOWc+gGon+WK20C7kBD0Ot/KPE/uf9N+wsU=", "30.0": "sha256-lr86X77v1X19wMIKLHuz8iathLeeW1CThoJDIgF7lBc=", "29.3": "sha256-mniANtj5hU97A8MF30d3zw5U5bCB4lvxUlLah+DpCHU=", @@ -123,6 +131,7 @@ PROTOC_BUILDS = { "@platforms//cpu:x86_32", ], "integrity": { + "30.2": "sha256-XK6VrN8WkMCiTxh9uny6JdjuYAhcyVGn2SdM/gdx2RY=", "30.1": "sha256-nfRHsT+ijJqqwRdPWb30Al9KG9tuS2s/HOs+5o8HEQE=", "30.0": "sha256-g9c7ejnygRxhB/azkoWsWw8PRmNh1Gg96j796WNkMuY=", "29.3": "sha256-x8gCjBxNgBxTYCkg8shokgVAhr2WW2sjpLqV0hHcsdQ=", @@ -137,6 +146,7 @@ PROTOC_BUILDS = { "@platforms//cpu:x86_64", ], "integrity": { + "30.2": "sha256-EPNd93Iqad3o7pK0oWpOHMkc/Ogvu0o3G9BG3hOapKk=", "30.1": "sha256-d/TgIs6eiwh8uJP1P15DNzSULRJeTNL+y/gwrHdgBFw=", "30.0": "sha256-yEww2siMaLQKLkfFtsdi3B7Amu6zLB0efs8l153PnNo=", "29.3": "sha256-V+pZ6fVRrY1x/6qbXPvgyh9Ocglyodt+wtEqtEv/k4M=", diff --git a/protoc/private/protoc_toolchains.bzl b/protoc/private/protoc_toolchains.bzl index ab5e800c3..efbe8bf6d 100644 --- a/protoc/private/protoc_toolchains.bzl +++ b/protoc/private/protoc_toolchains.bzl @@ -17,9 +17,14 @@ def _default_platform(): for platform, info in PROTOC_BUILDS.items(): if sorted(info["exec_compat"]) == host_platform: return platform + + # Temporary measure until native Windows ARM64 builds exist. + if host_platform == ["@platforms//cpu:aarch64", "@platforms//os:windows"]: + return "win64" + fail( "no protoc build found for host platform with constraints: " + - HOST_CONSTRAINTS, + ", ".join(HOST_CONSTRAINTS), ) def _platform_build(platform): diff --git a/scala/deps.bzl b/scala/deps.bzl index 85fbe65e0..0945df689 100644 --- a/scala/deps.bzl +++ b/scala/deps.bzl @@ -8,10 +8,10 @@ def rules_scala_dependencies(): maybe( http_archive, name = "bazel_skylib", - sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f", + sha256 = "41449d7c7372d2e270e8504dfab09ee974325b0b40fdd98172c7fbe257b8bcc9", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz", - "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.0/bazel-skylib-1.6.0.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.0/bazel-skylib-1.6.0.tar.gz", ], ) @@ -19,52 +19,48 @@ def rules_scala_dependencies(): http_archive, name = "platforms", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz", - "https://github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.9/platforms-0.0.9.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.9/platforms-0.0.9.tar.gz", ], - sha256 = "29742e87275809b5e598dc2f04d86960cc7a55b3067d97221c9abbc9926bff0f", + sha256 = "5eda539c841265031c2f82d8ae7a3a6490bd62176e0c038fc469eabf91f6149b", ) - maybe( - http_archive, - name = "rules_cc", - urls = ["https://github.com/bazelbuild/rules_cc/releases/download/0.1.1/rules_cc-0.1.1.tar.gz"], - sha256 = "712d77868b3152dd618c4d64faaddefcc5965f90f5de6e6dd1d5ddcd0be82d42", - strip_prefix = "rules_cc-0.1.1", - ) - - maybe( - http_archive, - name = "abseil-cpp", - sha256 = "b396401fd29e2e679cace77867481d388c807671dc2acc602a0259eeb79b7811", - strip_prefix = "abseil-cpp-20250127.1", - url = "https://github.com/abseil/abseil-cpp/archive/refs/tags/20250127.1.tar.gz", - ) + # If using `rules_java` between 7.6.0 and 8.4.0, the `WORKSPACE` statements + # are different. See: + # - https://github.com/bazelbuild/rules_java/releases/tag/7.6.0 + #maybe( + # http_archive, + # name = "rules_java", + # urls = [ + # "https://github.com/bazelbuild/rules_java/releases/download/7.6.0/rules_java-7.6.0.tar.gz", + # ], + # sha256 = "1da22389fe688c515ed732d01a2b18f3961eb4431aec40dcbaa043b58ba7941e", + #) maybe( http_archive, name = "rules_java", urls = [ - "https://github.com/bazelbuild/rules_java/releases/download/8.11.0/rules_java-8.11.0.tar.gz", + "https://github.com/bazelbuild/rules_java/releases/download/8.5.0/rules_java-8.5.0.tar.gz", ], - sha256 = "d31b6c69e479ffa45460b64dc9c7792a431cac721ef8d5219fc9f603fa2ff877", + sha256 = "5c215757b9a6c3dd5312a3cdc4896cef3f0c5b31db31baa8da0d988685d42ae4", ) maybe( http_archive, name = "com_google_protobuf", - sha256 = "1451b03faec83aed17cdc71671d1bbdfd72e54086b827f5f6fd02bf7a4041b68", - strip_prefix = "protobuf-30.1", - url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v30.1.tar.gz", - repo_mapping = {"@com_google_absl": "@abseil-cpp"}, - patches = [Label("//protoc:0001-protobuf-19679-rm-protoc-dep.patch")], - patch_args = ["-p1"], + sha256 = "b2340aa47faf7ef10a0328190319d3f3bee1b24f426d4ce8f4253b6f27ce16db", + strip_prefix = "protobuf-28.2", + url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v28.2.tar.gz", ) + # The `WORKSPACE` snippets for different versions of `rules_proto` vary + # somewhat. See https://github.com/bazelbuild/rules_proto/releases for the + # corresponding `rules_proto` release for details. maybe( http_archive, name = "rules_proto", - sha256 = "14a225870ab4e91869652cfd69ef2028277fc1dc4910d65d353b62d6e0ae21f4", - strip_prefix = "rules_proto-7.1.0", - url = "https://github.com/bazelbuild/rules_proto/releases/download/7.1.0/rules_proto-7.1.0.tar.gz", + sha256 = "6fb6767d1bef535310547e03247f7518b03487740c11b6c6adb7952033fe1295", + strip_prefix = "rules_proto-6.0.2", + url = "https://github.com/bazelbuild/rules_proto/releases/download/6.0.2/rules_proto-6.0.2.tar.gz", ) diff --git a/scala/latest_deps.bzl b/scala/latest_deps.bzl new file mode 100644 index 000000000..b59dccbc8 --- /dev/null +++ b/scala/latest_deps.bzl @@ -0,0 +1,53 @@ +"""Macro for instantiating repos required for core functionality.""" + +load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") +load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") + +def rules_scala_dependencies(): + """Instantiates repos needed by rules provided by `rules_scala`.""" + maybe( + http_archive, + name = "bazel_skylib", + sha256 = "bc283cdfcd526a52c3201279cda4bc298652efa898b10b4db0837dc51652756f", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/releases/download/1.7.1/bazel-skylib-1.7.1.tar.gz", + ], + ) + + maybe( + http_archive, + name = "platforms", + urls = [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz", + "https://github.com/bazelbuild/platforms/releases/download/0.0.11/platforms-0.0.11.tar.gz", + ], + sha256 = "29742e87275809b5e598dc2f04d86960cc7a55b3067d97221c9abbc9926bff0f", + ) + + maybe( + http_archive, + name = "rules_java", + urls = [ + "https://github.com/bazelbuild/rules_java/releases/download/8.11.0/rules_java-8.11.0.tar.gz", + ], + sha256 = "d31b6c69e479ffa45460b64dc9c7792a431cac721ef8d5219fc9f603fa2ff877", + ) + + maybe( + http_archive, + name = "com_google_protobuf", + sha256 = "07a43d88fe5a38e434c7f94129cad56a4c43a51f99336074d0799c2f7d4e44c5", + strip_prefix = "protobuf-30.2", + url = "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v30.2.tar.gz", + patches = [Label("//protoc:0001-protobuf-19679-rm-protoc-dep.patch")], + patch_args = ["-p1"], + ) + + maybe( + http_archive, + name = "rules_proto", + sha256 = "14a225870ab4e91869652cfd69ef2028277fc1dc4910d65d353b62d6e0ae21f4", + strip_prefix = "rules_proto-7.1.0", + url = "https://github.com/bazelbuild/rules_proto/releases/download/7.1.0/rules_proto-7.1.0.tar.gz", + ) diff --git a/scripts/create_repository.py b/scripts/create_repository.py index 09a9f61a5..bdc8a2621 100755 --- a/scripts/create_repository.py +++ b/scripts/create_repository.py @@ -31,7 +31,7 @@ SCALATEST_VERSION = "3.2.19" SCALAFMT_VERSION = "3.9.4" KIND_PROJECTOR_VERSION = "0.13.3" -PROTOBUF_JAVA_VERSION = "4.30.1" +PROTOBUF_JAVA_VERSION = "4.30.2" JLINE_VERSION = '3.29.0' SCALAPB_VERSION = '1.0.0-alpha.1' PROTOC_BRIDGE_VERSION = '0.9.8' diff --git a/scripts/update_protoc_integrity.py b/scripts/update_protoc_integrity.py index 68bf41a70..55ff8bab3 100755 --- a/scripts/update_protoc_integrity.py +++ b/scripts/update_protoc_integrity.py @@ -27,6 +27,7 @@ import sys PROTOC_VERSIONS = [ + "30.2", "30.1", "30.0", "29.3", diff --git a/test_cross_build/MODULE.bazel b/test_cross_build/MODULE.bazel index 978207734..a5ac5075c 100644 --- a/test_cross_build/MODULE.bazel +++ b/test_cross_build/MODULE.bazel @@ -8,6 +8,12 @@ local_path_override( path = "..", ) +bazel_dep(name = "latest_dependencies") +local_path_override( + module_name = "latest_dependencies", + path = "../deps/latest", +) + scala_config = use_extension( "@rules_scala//scala/extensions:config.bzl", "scala_config", @@ -53,12 +59,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) diff --git a/test_cross_build/WORKSPACE b/test_cross_build/WORKSPACE index 4a4876e72..ed0c6e944 100644 --- a/test_cross_build/WORKSPACE +++ b/test_cross_build/WORKSPACE @@ -7,7 +7,7 @@ local_repository( path = "..", ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/test_version/MODULE.bazel.template b/test_version/MODULE.bazel.template index 621165fdd..1c30aeb30 100644 --- a/test_version/MODULE.bazel.template +++ b/test_version/MODULE.bazel.template @@ -2,12 +2,23 @@ module(name = "rules_scala_test_version") +bazel_dep(name = "rules_scala") +local_path_override( + module_name = "rules_scala", + path = "../..", +) + +bazel_dep(name = "latest_dependencies") +local_path_override( + module_name = "latest_dependencies", + path = "../../deps/latest", +) + bazel_dep(name = "rules_java", version = "8.11.0") bazel_dep(name = "rules_proto", version = "7.1.0") -bazel_dep(name = "rules_cc", version = "0.1.1") bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) @@ -17,13 +28,7 @@ single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", -) - -bazel_dep(name = "rules_scala") -local_path_override( - module_name = "rules_scala", - path = "../..", + version = "30.2", ) scala_config = use_extension( diff --git a/test_version/WORKSPACE.template b/test_version/WORKSPACE.template index a36fbb248..37d09f5a5 100644 --- a/test_version/WORKSPACE.template +++ b/test_version/WORKSPACE.template @@ -7,7 +7,7 @@ local_repository( path = "../../" ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/third_party/repositories/scala_2_11.bzl b/third_party/repositories/scala_2_11.bzl index f502cb854..568855701 100644 --- a/third_party/repositories/scala_2_11.bzl +++ b/third_party/repositories/scala_2_11.bzl @@ -67,8 +67,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.30.1", - "sha256": "ff666fc33646eb2b609259b7928fc675782e401ee6e39ef3ae4581e06f642a15", + "artifact": "com.google.protobuf:protobuf-java:4.30.2", + "sha256": "0f3a4e9264db07cec429f2a68a66030e9b7487277b76863cdd0e9238cece249b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.11:0.2.6", diff --git a/third_party/repositories/scala_2_12.bzl b/third_party/repositories/scala_2_12.bzl index fb4714e11..b0c4b4eac 100644 --- a/third_party/repositories/scala_2_12.bzl +++ b/third_party/repositories/scala_2_12.bzl @@ -52,8 +52,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.30.1", - "sha256": "ff666fc33646eb2b609259b7928fc675782e401ee6e39ef3ae4581e06f642a15", + "artifact": "com.google.protobuf:protobuf-java:4.30.2", + "sha256": "0f3a4e9264db07cec429f2a68a66030e9b7487277b76863cdd0e9238cece249b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.12:0.5.0", diff --git a/third_party/repositories/scala_2_13.bzl b/third_party/repositories/scala_2_13.bzl index 212a583e1..9d48af512 100644 --- a/third_party/repositories/scala_2_13.bzl +++ b/third_party/repositories/scala_2_13.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.30.1", - "sha256": "ff666fc33646eb2b609259b7928fc675782e401ee6e39ef3ae4581e06f642a15", + "artifact": "com.google.protobuf:protobuf-java:4.30.2", + "sha256": "0f3a4e9264db07cec429f2a68a66030e9b7487277b76863cdd0e9238cece249b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", diff --git a/third_party/repositories/scala_3_1.bzl b/third_party/repositories/scala_3_1.bzl index 6d2011190..6581ce686 100644 --- a/third_party/repositories/scala_3_1.bzl +++ b/third_party/repositories/scala_3_1.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.30.1", - "sha256": "ff666fc33646eb2b609259b7928fc675782e401ee6e39ef3ae4581e06f642a15", + "artifact": "com.google.protobuf:protobuf-java:4.30.2", + "sha256": "0f3a4e9264db07cec429f2a68a66030e9b7487277b76863cdd0e9238cece249b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", diff --git a/third_party/repositories/scala_3_2.bzl b/third_party/repositories/scala_3_2.bzl index da1a85acc..272144ef5 100644 --- a/third_party/repositories/scala_3_2.bzl +++ b/third_party/repositories/scala_3_2.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.30.1", - "sha256": "ff666fc33646eb2b609259b7928fc675782e401ee6e39ef3ae4581e06f642a15", + "artifact": "com.google.protobuf:protobuf-java:4.30.2", + "sha256": "0f3a4e9264db07cec429f2a68a66030e9b7487277b76863cdd0e9238cece249b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", diff --git a/third_party/repositories/scala_3_3.bzl b/third_party/repositories/scala_3_3.bzl index 2218a26a5..20a407733 100644 --- a/third_party/repositories/scala_3_3.bzl +++ b/third_party/repositories/scala_3_3.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.30.1", - "sha256": "ff666fc33646eb2b609259b7928fc675782e401ee6e39ef3ae4581e06f642a15", + "artifact": "com.google.protobuf:protobuf-java:4.30.2", + "sha256": "0f3a4e9264db07cec429f2a68a66030e9b7487277b76863cdd0e9238cece249b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", diff --git a/third_party/repositories/scala_3_4.bzl b/third_party/repositories/scala_3_4.bzl index f091c65de..1d0a2af8a 100644 --- a/third_party/repositories/scala_3_4.bzl +++ b/third_party/repositories/scala_3_4.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.30.1", - "sha256": "ff666fc33646eb2b609259b7928fc675782e401ee6e39ef3ae4581e06f642a15", + "artifact": "com.google.protobuf:protobuf-java:4.30.2", + "sha256": "0f3a4e9264db07cec429f2a68a66030e9b7487277b76863cdd0e9238cece249b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", diff --git a/third_party/repositories/scala_3_5.bzl b/third_party/repositories/scala_3_5.bzl index 755b46c88..b8a320d43 100644 --- a/third_party/repositories/scala_3_5.bzl +++ b/third_party/repositories/scala_3_5.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.30.1", - "sha256": "ff666fc33646eb2b609259b7928fc675782e401ee6e39ef3ae4581e06f642a15", + "artifact": "com.google.protobuf:protobuf-java:4.30.2", + "sha256": "0f3a4e9264db07cec429f2a68a66030e9b7487277b76863cdd0e9238cece249b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", diff --git a/third_party/repositories/scala_3_6.bzl b/third_party/repositories/scala_3_6.bzl index 78b7e6c3a..d3c1649b8 100644 --- a/third_party/repositories/scala_3_6.bzl +++ b/third_party/repositories/scala_3_6.bzl @@ -48,8 +48,8 @@ artifacts = { "sha256": "88241573467ddca44ffd4d74aa04c2bbfd11bf7c17e0c342c94c9de7a70a7c64", }, "com_google_protobuf_protobuf_java": { - "artifact": "com.google.protobuf:protobuf-java:4.30.1", - "sha256": "ff666fc33646eb2b609259b7928fc675782e401ee6e39ef3ae4581e06f642a15", + "artifact": "com.google.protobuf:protobuf-java:4.30.2", + "sha256": "0f3a4e9264db07cec429f2a68a66030e9b7487277b76863cdd0e9238cece249b", }, "com_lihaoyi_fansi": { "artifact": "com.lihaoyi:fansi_2.13:0.5.0", diff --git a/third_party/test/example_external_workspace/MODULE.bazel b/third_party/test/example_external_workspace/MODULE.bazel index 1da9cab63..bb0e7baef 100644 --- a/third_party/test/example_external_workspace/MODULE.bazel +++ b/third_party/test/example_external_workspace/MODULE.bazel @@ -32,12 +32,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) diff --git a/third_party/test/example_external_workspace/WORKSPACE b/third_party/test/example_external_workspace/WORKSPACE index 4600211b0..7e94e3213 100644 --- a/third_party/test/example_external_workspace/WORKSPACE +++ b/third_party/test/example_external_workspace/WORKSPACE @@ -7,7 +7,7 @@ local_repository( path = "../../..", ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies() diff --git a/third_party/test/proto/MODULE.bazel b/third_party/test/proto/MODULE.bazel index e9f07c6e5..3a9066942 100644 --- a/third_party/test/proto/MODULE.bazel +++ b/third_party/test/proto/MODULE.bazel @@ -8,6 +8,12 @@ local_path_override( path = "../../..", ) +bazel_dep(name = "latest_dependencies") +local_path_override( + module_name = "latest_dependencies", + path = "../../../deps/latest", +) + scala_deps = use_extension( "@rules_scala//scala/extensions:deps.bzl", "scala_deps", @@ -33,12 +39,12 @@ register_toolchains( # protocolbuffers/protobuf#19679. bazel_dep( name = "protobuf", - version = "30.1", + version = "30.2", repo_name = "com_google_protobuf", ) single_version_override( module_name = "protobuf", patch_strip = 1, patches = ["//:protobuf.patch"], - version = "30.1", + version = "30.2", ) diff --git a/third_party/test/proto/WORKSPACE b/third_party/test/proto/WORKSPACE index a208c6e1a..64954a40d 100644 --- a/third_party/test/proto/WORKSPACE +++ b/third_party/test/proto/WORKSPACE @@ -7,7 +7,7 @@ local_repository( path = "../../..", ) -load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies") +load("@rules_scala//scala:latest_deps.bzl", "rules_scala_dependencies") rules_scala_dependencies()