Skip to content

Commit 85519d0

Browse files
committed
Fix WORKSPACE snippet for rules_java 7.x
The `WORKSPACE` snippet in the `README.md` now matches what's currently in all the other `WORKSPACE` files. I'd previously included the `rules_java` 8.x statements from my Bazel 8 compatibility branch in the `README.md` changes for `rules_scala` 7.x. @gergelyfabian tried the previous snippet from bazel-contrib#1703, and it broke his build: - bazel-contrib#1703 (comment)
1 parent 6b38cd5 commit 85519d0

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

README.md

+10-4
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,13 @@ load("@rules_scala//scala:deps.bzl", "rules_scala_dependencies")
6262

6363
rules_scala_dependencies()
6464

65-
load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
65+
# In `rules_scala` 7.x, `scala/deps.bzl` imports `rules_java` 7.x. This
66+
# statement will change for `rules_scala` 8.x, which will use `rules_java` 8.x.
67+
load(
68+
"@rules_java//java:repositories.bzl",
69+
"rules_java_dependencies",
70+
"rules_java_toolchains",
71+
)
6672

6773
rules_java_dependencies()
6874

@@ -85,15 +91,15 @@ load("@rules_python//python:repositories.bzl", "py_repositories")
8591

8692
py_repositories()
8793

88-
# Note that `rules_java` suggests loading `protobuf_deps()` after
94+
# Note that `rules_java` 8.x suggests loading `protobuf_deps()` after
8995
# `rules_java_dependencies` and before `rules_java_toolchains()`:
9096
# - https://github.com/bazelbuild/rules_java/releases/tag/8.9.0
97+
#
98+
# `rules_java` 7.x also works with this ordering.
9199
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
92100

93101
protobuf_deps()
94102

95-
load("@rules_java//java:repositories.bzl", "rules_java_toolchains")
96-
97103
rules_java_toolchains()
98104

99105
load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")

WORKSPACE

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ load("//scala:deps.bzl", "rules_scala_dependencies")
55

66
rules_scala_dependencies()
77

8-
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
8+
load(
9+
"@rules_java//java:repositories.bzl",
10+
"rules_java_dependencies",
11+
"rules_java_toolchains",
12+
)
913

1014
rules_java_dependencies()
1115

0 commit comments

Comments
 (0)