Skip to content

Commit b1f3d30

Browse files
committed
fix bazel 8.x workspace init
1 parent ca810a4 commit b1f3d30

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

WORKSPACE

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,21 @@ load("//:internal_dev_deps.bzl", "rules_python_internal_deps")
2121

2222
rules_python_internal_deps()
2323

24+
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
25+
26+
rules_java_dependencies()
27+
28+
# note that the following line is what is minimally required from protobuf for the java rules
29+
# consider using the protobuf_deps() public API from @com_google_protobuf//:protobuf_deps.bzl
30+
load("@com_google_protobuf//bazel/private:proto_bazel_features.bzl", "proto_bazel_features") # buildifier: disable=bzl-visibility
31+
32+
proto_bazel_features(name = "proto_bazel_features")
33+
34+
# register toolchains
35+
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
36+
37+
rules_java_toolchains()
38+
2439
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
2540

2641
protobuf_deps()

internal_dev_deps.bzl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,9 @@ def rules_python_internal_deps():
195195
http_archive(
196196
name = "rules_java",
197197
urls = [
198-
"https://mirror.bazel.build/github.com/bazelbuild/rules_java/releases/download/8.3.1/rules_java-8.3.1.tar.gz",
199-
"https://github.com/bazelbuild/rules_java/releases/download/8.3.1/rules_java-8.3.1.tar.gz",
198+
"https://github.com/bazelbuild/rules_java/releases/download/8.6.2/rules_java-8.6.2.tar.gz",
200199
],
201-
sha256 = "ee786b943e00da4fea7c233e70e5f5b8a01cc69b9341b3f49169f174fe0df1c5",
200+
sha256 = "a64ab04616e76a448c2c2d8165d836f0d2fb0906200d0b7c7376f46dd62e59cc",
202201
)
203202

204203
RULES_JVM_EXTERNAL_TAG = "5.2"

internal_dev_setup.bzl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ load("@cgrindel_bazel_starlib//:deps.bzl", "bazel_starlib_dependencies")
2020
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
2121
load("@rules_bazel_integration_test//bazel_integration_test:deps.bzl", "bazel_integration_test_rules_dependencies")
2222
load("@rules_bazel_integration_test//bazel_integration_test:repo_defs.bzl", "bazel_binaries")
23-
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
2423
load("@rules_shell//shell:repositories.bzl", "rules_shell_dependencies", "rules_shell_toolchains")
2524
load("//:version.bzl", "SUPPORTED_BAZEL_VERSIONS")
2625
load("//python:versions.bzl", "MINOR_MAPPING", "TOOL_VERSIONS")
@@ -47,9 +46,6 @@ def rules_python_internal_setup():
4746

4847
protobuf_deps()
4948

50-
rules_java_dependencies()
51-
rules_java_toolchains()
52-
5349
bazel_integration_test_rules_dependencies()
5450
bazel_starlib_dependencies()
5551
bazel_binaries(versions = SUPPORTED_BAZEL_VERSIONS)

0 commit comments

Comments
 (0)