Skip to content

Bump dependencies, update release_prep.sh, docs #1745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 10, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# Remove once Bazel 8 becomes the minimum supported version.
common --noenable_workspace --incompatible_use_plus_in_repo_names

# Uncomment for WORKSPACE builds for Bazel [8.0.0, 8.3.0) per:
# https://github.com/bazelbuild/rules_java/releases/tag/8.12.0
#common --repositories_without_autoloads=bazel_features_version,bazel_features_globals

# Remove if protocol compiler toolchainization ever becomes the default.
# - https://bazel.build/reference/command-line-reference#flag--incompatible_enable_proto_toolchain_resolution
# - https://docs.google.com/document/d/1CE6wJHNfKbUPBr7-mmk_0Yo3a4TaqcTPE0OWNuQkhPs/edit
2 changes: 1 addition & 1 deletion .github/workflows/release_prep.sh
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ set -o errexit -o nounset -o pipefail

# Single tag arg is passed by https://github.com/bazel-contrib/.github/blob/master/.github/workflows/release_ruleset.yaml
TAG="$1"
VERSION="${TAG:1}"
VERSION="${TAG#v}"
PREFIX="rules_scala-${VERSION}"
ARCHIVE="rules_scala-$TAG.tar.gz"
git archive --format=tar --prefix=${PREFIX}/ ${TAG} | gzip > $ARCHIVE
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.9.6"
version = "3.9.7"
runner.dialect = scala213
align.openParenCallSite = false
align.openParenDefnSite = false
16 changes: 8 additions & 8 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -36,13 +36,13 @@ single_version_override(
bazel_dep(name = "platforms", version = "0.0.9")
single_version_override(
module_name = "platforms",
version = "0.0.11",
version = "1.0.0",
)

bazel_dep(name = "rules_java", version = "7.6.0")
single_version_override(
module_name = "rules_java",
version = "8.11.0",
version = "8.12.0",
)

bazel_dep(name = "rules_proto", version = "6.0.0")
@@ -63,7 +63,7 @@ single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//protoc:0001-protobuf-19679-rm-protoc-dep.patch"],
version = "30.2",
version = "31.1",
)

scala_protoc = use_extension(
@@ -254,7 +254,7 @@ bazel_dep(
)
bazel_dep(
name = "rules_go",
version = "0.54.0",
version = "0.55.0",
dev_dependency = True,
repo_name = "io_bazel_rules_go", # for com_github_bazelbuild_buildtools
)
@@ -265,7 +265,7 @@ go_sdk = use_extension(
"go_sdk",
dev_dependency = True,
)
go_sdk.download(version = "1.24.2")
go_sdk.download(version = "1.24.4")

go_deps = use_extension(
"@gazelle//:extensions.bzl",
@@ -287,8 +287,8 @@ go_deps = use_extension(
# curl https://sum.golang.org/lookup/golang.org/x/[email protected]
go_deps.module(
path = "golang.org/x/tools",
sum = "h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=",
version = "v0.33.0",
sum = "h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=",
version = "v0.34.0",
)
go_deps.module(
path = "github.com/golang/protobuf",
@@ -301,5 +301,5 @@ use_repo(
"org_golang_x_tools",
)

bazel_dep(name = "rules_python", version = "1.4.0", dev_dependency = True)
bazel_dep(name = "rules_python", version = "1.4.1", dev_dependency = True)
bazel_dep(name = "rules_shell", version = "0.4.1", dev_dependency = True)
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -209,6 +209,10 @@ load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()
18 changes: 11 additions & 7 deletions WORKSPACE
Original file line number Diff line number Diff line change
@@ -23,15 +23,19 @@ load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

http_archive(
name = "rules_python",
sha256 = "a837679f1382f26968c1ee6f839c7daf9079aa53128069a1f2815decaa637304",
strip_prefix = "rules_python-1.4.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.0/rules_python-1.4.0.tar.gz",
sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3",
strip_prefix = "rules_python-1.4.1",
url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz",
)

load("@rules_python//python:repositories.bzl", "py_repositories")
@@ -108,10 +112,10 @@ local_repository(

http_archive(
name = "io_bazel_rules_go",
sha256 = "f2d15bea3e241aa0e3a90fb17a82e6a8ab12214789f6aeddd53b8d04316d2b7c",
sha256 = "c6cf9da6668ac84c470c43cbfccb8fdc844ead2b5a8b918e2816d44f2986f644",
urls = [
"https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.54.0/rules_go-v0.54.0.zip",
"https://github.com/bazel-contrib/rules_go/releases/download/v0.54.0/rules_go-v0.54.0.zip",
"https://mirror.bazel.build/github.com/bazel-contrib/rules_go/releases/download/v0.55.0/rules_go-v0.55.0.zip",
"https://github.com/bazel-contrib/rules_go/releases/download/v0.55.0/rules_go-v0.55.0.zip",
],
)

@@ -123,7 +127,7 @@ load(

go_rules_dependencies()

go_register_toolchains(version = "1.24.2")
go_register_toolchains(version = "1.24.4")

http_archive(
name = "bazelci_rules",
6 changes: 3 additions & 3 deletions deps/latest/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -7,9 +7,9 @@ module(
)

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 = "platforms", version = "1.0.0")
bazel_dep(name = "protobuf", version = "31.1")
bazel_dep(name = "rules_java", version = "8.12.0")
bazel_dep(name = "rules_proto", version = "7.1.0")

# https://github.com/bazelbuild/bazel/pull/25681 removed
2 changes: 1 addition & 1 deletion docs/scala_proto_library.md
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ needed for ScalaPB:
```py
# MODULE.bazel
scala_deps.scala_proto(
"default_gen_opts" = [
default_gen_opts = [
"grpc",
"flat_package",
"scala3_sources",
14 changes: 12 additions & 2 deletions docs/testing.md
Original file line number Diff line number Diff line change
@@ -3,9 +3,20 @@
Toolchain type `testing_toolchain_type` is used to set up test dependencies. You can customize
test dependencies by defining a custom testing toolchain.

In your `WORKSPACE` default repositories and toolchains can be loaded via:
Builtin repositories and toolchains can be loaded via:

```py
# MODULE.bazel
scala_deps = use_extension(
"@rules_scala//scala/extensions:deps.bzl",
"scala_deps",
)
scala_deps.scala() # Ensure builtin Scala toolchain deps are visible
scala_deps.junit() # JUnit 4
scala_deps.scalatest() # ScalaTest
scala_deps.specs2() # Specs2 with JUnit

# legacy WORKSPACE
load(
"@rules_scala//scala:toolchains.bzl",
"scala_register_toolchains",
@@ -16,7 +27,6 @@ scala_toolchains(
junit = True, # JUnit 4
scalatest = True, # ScalaTest
specs2 = True, # Specs2 with JUnit
testing = True, # Use for all of the above, instead of individual settings
)

scala_register_toolchains()
4 changes: 2 additions & 2 deletions dt_patches/test_dt_patches/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -75,12 +75,12 @@ register_toolchains(
# protocolbuffers/protobuf#19679.
bazel_dep(
name = "protobuf",
version = "30.2",
version = "31.1",
repo_name = "com_google_protobuf",
)
single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "30.2",
version = "31.1",
)
10 changes: 7 additions & 3 deletions dt_patches/test_dt_patches/WORKSPACE
Original file line number Diff line number Diff line change
@@ -21,15 +21,19 @@ load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

http_archive(
name = "rules_python",
sha256 = "a837679f1382f26968c1ee6f839c7daf9079aa53128069a1f2815decaa637304",
strip_prefix = "rules_python-1.4.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.0/rules_python-1.4.0.tar.gz",
sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3",
strip_prefix = "rules_python-1.4.1",
url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz",
)

load("@rules_python//python:repositories.bzl", "py_repositories")
4 changes: 2 additions & 2 deletions dt_patches/test_dt_patches_user_srcjar/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -191,12 +191,12 @@ register_toolchains(
# protocolbuffers/protobuf#19679.
bazel_dep(
name = "protobuf",
version = "30.2",
version = "31.1",
repo_name = "com_google_protobuf",
)
single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "30.2",
version = "31.1",
)
10 changes: 7 additions & 3 deletions dt_patches/test_dt_patches_user_srcjar/WORKSPACE
Original file line number Diff line number Diff line change
@@ -21,15 +21,19 @@ load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

http_archive(
name = "rules_python",
sha256 = "a837679f1382f26968c1ee6f839c7daf9079aa53128069a1f2815decaa637304",
strip_prefix = "rules_python-1.4.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.0/rules_python-1.4.0.tar.gz",
sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3",
strip_prefix = "rules_python-1.4.1",
url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz",
)

load("@rules_python//python:repositories.bzl", "py_repositories")
4 changes: 2 additions & 2 deletions examples/crossbuild/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -55,12 +55,12 @@ register_toolchains(
# protocolbuffers/protobuf#19679.
bazel_dep(
name = "protobuf",
version = "30.2",
version = "31.1",
repo_name = "com_google_protobuf",
)
single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "30.2",
version = "31.1",
)
10 changes: 7 additions & 3 deletions examples/crossbuild/WORKSPACE
Original file line number Diff line number Diff line change
@@ -21,15 +21,19 @@ load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

http_archive(
name = "rules_python",
sha256 = "a837679f1382f26968c1ee6f839c7daf9079aa53128069a1f2815decaa637304",
strip_prefix = "rules_python-1.4.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.0/rules_python-1.4.0.tar.gz",
sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3",
strip_prefix = "rules_python-1.4.1",
url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz",
)

load("@rules_python//python:repositories.bzl", "py_repositories")
4 changes: 2 additions & 2 deletions examples/overridden_artifacts/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -80,12 +80,12 @@ register_toolchains(
# protocolbuffers/protobuf#19679.
bazel_dep(
name = "protobuf",
version = "30.2",
version = "31.1",
repo_name = "com_google_protobuf",
)
single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "30.2",
version = "31.1",
)
10 changes: 7 additions & 3 deletions examples/overridden_artifacts/WORKSPACE
Original file line number Diff line number Diff line change
@@ -21,15 +21,19 @@ load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

http_archive(
name = "rules_python",
sha256 = "a837679f1382f26968c1ee6f839c7daf9079aa53128069a1f2815decaa637304",
strip_prefix = "rules_python-1.4.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.0/rules_python-1.4.0.tar.gz",
sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3",
strip_prefix = "rules_python-1.4.1",
url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz",
)

load("@rules_python//python:repositories.bzl", "py_repositories")
4 changes: 2 additions & 2 deletions examples/scala3/MODULE.bazel
Original file line number Diff line number Diff line change
@@ -39,12 +39,12 @@ register_toolchains(
# protocolbuffers/protobuf#19679.
bazel_dep(
name = "protobuf",
version = "30.2",
version = "31.1",
repo_name = "com_google_protobuf",
)
single_version_override(
module_name = "protobuf",
patch_strip = 1,
patches = ["//:protobuf.patch"],
version = "30.2",
version = "31.1",
)
10 changes: 7 additions & 3 deletions examples/scala3/WORKSPACE
Original file line number Diff line number Diff line change
@@ -21,15 +21,19 @@ load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")

rules_java_dependencies()

load("@bazel_features//:deps.bzl", "bazel_features_deps")

bazel_features_deps()

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")

bazel_skylib_workspace()

http_archive(
name = "rules_python",
sha256 = "a837679f1382f26968c1ee6f839c7daf9079aa53128069a1f2815decaa637304",
strip_prefix = "rules_python-1.4.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.0/rules_python-1.4.0.tar.gz",
sha256 = "9f9f3b300a9264e4c77999312ce663be5dee9a56e361a1f6fe7ec60e1beef9a3",
strip_prefix = "rules_python-1.4.1",
url = "https://github.com/bazelbuild/rules_python/releases/download/1.4.1/rules_python-1.4.1.tar.gz",
)

load("@rules_python//python:repositories.bzl", "py_repositories")
Loading