Skip to content

Commit 3ebfc56

Browse files
committed
Update dependencies in preparation for v7.1.3
Updates the following Bazel dependency versions: - `.bazelversion`: 7.6.1 => 7.6.2 - Go: 1.25.1 => 1.25.3 - `bazel_skylib`: 1.8.1 => 1.8.2 - `golang.org/x/tools`: 0.37.0 => 0.38.0 - `protobuf`: v32.1 => v33.0 - Still missing protocolbuffers/protobuf#19679, so we keep patching. - `rules_cc`: 0.2.8 => 0.2.10 - `rules_go`: 0.57.0 => bazel-contrib/rules_go@74199c92 - This is a temporary workaround for bazel-contrib/rules_go#4480. - `rules_java`: 8.15.2 => 8.16.1 - Updates all legacy `WORKSPACE` files to invoke `bazel_features_deps` _before_ `rules_java_dependencies`, required since `rules_java` 8.16.0. - Adds `bazel_features` 1.37.0 to `rules_scala_dependencies` from `latest_deps.bzl` as an explicit dependency to enable the dependency setup macro reordering. - `rules_python`: 1.6.1 => 1.6.3 Updates the following Maven artifact versions, with `scripts/create_repository.py` having generated the changes to `third_party/repositories/scala_*.bzl`: - `com.google.api.grpc:proto-google-common-protos`: 2.61.1 => 2.62.0 - `com.google.guava:guava`: 33.4.8-jre => 33.5.0-jre - `com.google.protobuf:protobuf-java`: 4.32.1 => 4.33.0 - `com.thesamet.scalapb:scalapb-runtime_*`: 1.0.0-alpha.2 => 1.0.0-alpha.3 - `io.grpc:grpc-api`: 1.75.0 => 1.76.0 - `org.scala-lang.modules:scala-parser-combinators_*`: 1.1.2 => 2.4.0 - Adds logic to `scripts/create_repository.py` to keep the Scala 2.11 version of `scala-parser-combinators` at version 1.1.2 - `org.scala-sbt:compiler-interface`: 1.10.1 => 1.11.0 - `org.scala-sbt:util-interface`: 1.11.6 => 1.11.7 - `org.scalameta:scalafmt-*`: 3.9.9 => 3.10.1 - Updates `version` in all the `**.scalafmt*.conf` files to match. - `org.typelevel:kind-projector_*`: 0.13.3 => 0.13.4 --- This is in preparation for releasing v7.1.3, which will also contain the Scala 3.3.7 update from bazel-contrib#1777.
1 parent 15cec88 commit 3ebfc56

File tree

51 files changed

+936
-886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+936
-886
lines changed

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.6.1
1+
7.6.2

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.9.9"
1+
version = "3.10.1"
22
runner.dialect = scala213
33
align.openParenCallSite = false
44
align.openParenDefnSite = false

MODULE.bazel

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module(
44
name = "rules_scala",
5-
version = "7.1.2",
5+
version = "7.1.3",
66
bazel_compatibility = [">=7.1.0"],
77
compatibility_level = 7,
88
)
@@ -30,7 +30,7 @@ SCALA_VERSIONS = SCALA_2_VERSIONS + SCALA_3_VERSIONS
3030
bazel_dep(name = "bazel_skylib", version = "1.6.0")
3131
single_version_override(
3232
module_name = "bazel_skylib",
33-
version = "1.8.1",
33+
version = "1.8.2",
3434
)
3535

3636
bazel_dep(name = "platforms", version = "0.0.9")
@@ -42,7 +42,7 @@ single_version_override(
4242
bazel_dep(name = "rules_java", version = "7.6.0")
4343
single_version_override(
4444
module_name = "rules_java",
45-
version = "8.15.2",
45+
version = "8.16.1",
4646
)
4747

4848
bazel_dep(name = "rules_proto", version = "6.0.0")
@@ -63,7 +63,7 @@ single_version_override(
6363
module_name = "protobuf",
6464
patch_strip = 1,
6565
patches = ["//protoc:0001-protobuf-19679-rm-protoc-dep.patch"],
66-
version = "32.1",
66+
version = "33.0",
6767
)
6868

6969
# See //src/java/io/bazel/rulesscala/worker:worker_protocol_java_proto.
@@ -261,14 +261,23 @@ bazel_dep(
261261
dev_dependency = True,
262262
repo_name = "io_bazel_rules_go", # for com_github_bazelbuild_buildtools
263263
)
264+
265+
# Temporary workaround until rules_go > 0.57.0 becomes available to resolve:
266+
# https://github.com/bazel-contrib/rules_go/issues/4480
267+
git_override(
268+
module_name = "rules_go",
269+
commit = "74199c92e20399b6ef46684b2c6fdd94b50a7892",
270+
remote = "https://github.com/bazel-contrib/rules_go.git",
271+
)
272+
264273
bazel_dep(name = "gazelle", version = "0.45.0", dev_dependency = True)
265274

266275
go_sdk = use_extension(
267276
"@io_bazel_rules_go//go:extensions.bzl",
268277
"go_sdk",
269278
dev_dependency = True,
270279
)
271-
go_sdk.download(version = "1.25.1")
280+
go_sdk.download(version = "1.25.3")
272281

273282
go_deps = use_extension(
274283
"@gazelle//:extensions.bzl",
@@ -287,11 +296,11 @@ go_deps = use_extension(
287296
# - https://go.dev/ref/mod#checksum-database
288297
#
289298
# go list -m golang.org/x/tools@latest
290-
# curl https://sum.golang.org/lookup/golang.org/x/tools@v0.37.0
299+
# curl https://sum.golang.org/lookup/golang.org/x/tools@v0.38.0
291300
go_deps.module(
292301
path = "golang.org/x/tools",
293-
sum = "h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=",
294-
version = "v0.37.0",
302+
sum = "h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=",
303+
version = "v0.38.0",
295304
)
296305
go_deps.module(
297306
path = "github.com/golang/protobuf",
@@ -304,5 +313,5 @@ use_repo(
304313
"org_golang_x_tools",
305314
)
306315

307-
bazel_dep(name = "rules_python", version = "1.6.1", dev_dependency = True)
316+
bazel_dep(name = "rules_python", version = "1.6.3", dev_dependency = True)
308317
bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)

WORKSPACE

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ host_platform_repo(name = "host_platform")
1919
# others.
2020
register_toolchains("@rules_scala_protoc_toolchains//...:all")
2121

22-
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
23-
24-
rules_java_dependencies()
25-
22+
# Required before `rules_java_dependencies` since `rules_java` 8.16.0.
2623
load("@bazel_features//:deps.bzl", "bazel_features_deps")
2724

2825
bazel_features_deps()
2926

27+
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
28+
29+
rules_java_dependencies()
30+
3031
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
3132

3233
bazel_skylib_workspace()

deps/latest/MODULE.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ module(
66
bazel_compatibility = [">=7.1.0"],
77
)
88

9-
bazel_dep(name = "bazel_skylib", version = "1.8.1")
9+
bazel_dep(name = "bazel_skylib", version = "1.8.2")
1010
bazel_dep(name = "platforms", version = "1.0.0")
11-
bazel_dep(name = "protobuf", version = "32.0")
12-
bazel_dep(name = "rules_java", version = "8.15.2")
11+
bazel_dep(name = "protobuf", version = "33.0")
12+
bazel_dep(name = "rules_java", version = "8.16.1")
1313
bazel_dep(name = "rules_proto", version = "7.1.0")
1414

1515
# https://github.com/bazelbuild/bazel/pull/25681 removed
1616
# `bazel_tools/tools/cpp/osx_cc_wrapper.sh.tpl` in the `last_green` Bazel as of
1717
# 2025-04-08. At least `test_cross_build` breaks without this.
18-
bazel_dep(name = "rules_cc", version = "0.2.8")
18+
bazel_dep(name = "rules_cc", version = "0.2.10")

dt_patches/test_dt_patches/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,5 @@ single_version_override(
7878
module_name = "protobuf",
7979
patch_strip = 1,
8080
patches = ["//:protobuf.patch"],
81-
version = "32.1",
81+
version = "33.0",
8282
)

dt_patches/test_dt_patches/WORKSPACE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ host_platform_repo(name = "host_platform")
1515

1616
register_toolchains("@rules_scala_protoc_toolchains//...:all")
1717

18-
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
19-
20-
rules_java_dependencies()
21-
2218
load("@bazel_features//:deps.bzl", "bazel_features_deps")
2319

2420
bazel_features_deps()
2521

22+
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
23+
24+
rules_java_dependencies()
25+
2626
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
2727

2828
bazel_skylib_workspace()

dt_patches/test_dt_patches_user_srcjar/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,5 +194,5 @@ single_version_override(
194194
module_name = "protobuf",
195195
patch_strip = 1,
196196
patches = ["//:protobuf.patch"],
197-
version = "32.1",
197+
version = "33.0",
198198
)

dt_patches/test_dt_patches_user_srcjar/WORKSPACE

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ host_platform_repo(name = "host_platform")
1515

1616
register_toolchains("@rules_scala_protoc_toolchains//...:all")
1717

18-
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
19-
20-
rules_java_dependencies()
21-
2218
load("@bazel_features//:deps.bzl", "bazel_features_deps")
2319

2420
bazel_features_deps()
2521

22+
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
23+
24+
rules_java_dependencies()
25+
2626
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
2727

2828
bazel_skylib_workspace()

examples/crossbuild/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ single_version_override(
5858
module_name = "protobuf",
5959
patch_strip = 1,
6060
patches = ["//:protobuf.patch"],
61-
version = "32.1",
61+
version = "33.0",
6262
)

0 commit comments

Comments
 (0)