Skip to content

Commit 2705742

Browse files
author
jchadwick-buf
authored
Support Bazel 8, sans bzlmod (#68)
After updating `rules_java` appropriately, we can unblock Bazel 8 support when using `WORKSPACE` mode and no bzlmod. This is the first step towards bzlmod support.
1 parent 1961a55 commit 2705742

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
common --noenable_bzlmod
1+
common --noenable_bzlmod --enable_workspace
22

33
build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
44
build --cxxopt=-fsized-deallocation

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.4.0
1+
8.0.0

WORKSPACE

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@ load("//bazel:deps.bzl", "protovalidate_cc_dependencies")
44

55
protovalidate_cc_dependencies()
66

7-
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
7+
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
88

99
rules_java_dependencies()
1010

11-
rules_java_toolchains()
12-
1311
load("@rules_python//python:repositories.bzl", "py_repositories")
1412

1513
py_repositories()
@@ -18,6 +16,10 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
1816

1917
protobuf_deps()
2018

19+
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
20+
21+
rules_java_toolchains()
22+
2123
load("@rules_buf//buf:repositories.bzl", "rules_buf_dependencies", "rules_buf_toolchains")
2224

2325
rules_buf_dependencies()

bazel/deps.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ _dependencies = {
3636
],
3737
},
3838
"rules_java": {
39-
"sha256": "c0ee60f8757f140c157fc2c7af703d819514de6e025ebf70386d38bdd85fce83",
39+
"sha256": "b0b8b7b2cfbf575112acf716ec788847929f322efa5c34195eb12a43d1df7e5c",
4040
"urls": [
41-
"https://github.com/bazelbuild/rules_java/releases/download/7.12.3/rules_java-7.12.3.tar.gz"
41+
"https://github.com/bazelbuild/rules_java/releases/download/8.7.2/rules_java-8.7.2.tar.gz"
4242
],
4343
},
4444
"rules_python": {

0 commit comments

Comments
 (0)