Skip to content

Commit 8bc4290

Browse files
hvadehrarules_java Copybara
authored andcommitted
Release rules_java v8.5.0-rc2
Fixes missing bzl_library target for generating Bazel docs PiperOrigin-RevId: 698054336 Change-Id: I0ae6fe44adbe5e80744875f97b8c958117a0556a
1 parent 7170aea commit 8bc4290

5 files changed

Lines changed: 29 additions & 17 deletions

File tree

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module(
22
name = "rules_java",
3-
version = "8.5.0-rc1",
3+
version = "8.5.0-rc2",
44
bazel_compatibility = [">=6.3.0"],
55
compatibility_level = 1,
66
)

distro/relnotes.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def print_rel_notes(*, name, version, archive):
99
changelog=$$(/usr/bin/git log tags/$$last_rel..origin/master --format=oneline --)
1010
sha=$$(/usr/bin/sha256sum $(SRCS) | cut -d ' ' -f1)
1111
cat > $@ <<EOF
12-
**Changes since $$last_rel
12+
**Changes since $$last_rel**
1313
$$changelog
1414
1515
**MODULE.bazel setup**

java/common/BUILD

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ bzl_library(
1616
name = "common",
1717
srcs = glob(["*.bzl"]),
1818
visibility = ["//visibility:public"],
19-
deps = ["//java/private:internals"],
19+
deps = [
20+
"//java/private:internals",
21+
"@compatibility_proxy//:proxy_bzl",
22+
],
2023
)
2124

2225
filegroup(

java/rules_java_deps.bzl

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,28 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
66
def _compatibility_proxy_repo_impl(rctx):
77
# TODO: use @bazel_features
88
bazel = native.bazel_version
9-
rctx.file("BUILD.bazel", "")
9+
rctx.file(
10+
"BUILD.bazel",
11+
"""
12+
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
13+
bzl_library(name = "proxy_bzl", srcs = ["proxy.bzl"], visibility = ["//visibility:public"])
14+
""",
15+
)
1016
if not bazel or bazel >= "8":
1117
rctx.file(
1218
"proxy.bzl",
1319
"""
14-
load("@rules_java//java/bazel/rules:bazel_java_binary_wrapper.bzl", _java_binary = "java_binary") # copybara-use-repo-external-label
15-
load("@rules_java//java/bazel/rules:bazel_java_import.bzl", _java_import = "java_import") # copybara-use-repo-external-label
16-
load("@rules_java//java/bazel/rules:bazel_java_library.bzl", _java_library = "java_library") # copybara-use-repo-external-label
17-
load("@rules_java//java/bazel/rules:bazel_java_plugin.bzl", _java_plugin = "java_plugin") # copybara-use-repo-external-label
18-
load("@rules_java//java/bazel/rules:bazel_java_test.bzl", _java_test = "java_test") # copybara-use-repo-external-label
19-
load("@rules_java//java/common/rules:java_package_configuration.bzl", _java_package_configuration = "java_package_configuration") # copybara-use-repo-external-label
20-
load("@rules_java//java/common/rules:java_runtime.bzl", _java_runtime = "java_runtime") # copybara-use-repo-external-label
21-
load("@rules_java//java/common/rules:java_toolchain.bzl", _java_toolchain = "java_toolchain") # copybara-use-repo-external-label
22-
load("@rules_java//java/private:java_common.bzl", _java_common = "java_common") # copybara-use-repo-external-label
23-
load("@rules_java//java/private:java_info.bzl", _JavaInfo = "JavaInfo", _JavaPluginInfo = "JavaPluginInfo") # copybara-use-repo-external-label
24-
load("@rules_java//java:http_jar.bzl", _http_jar = "http_jar") # copybara-use-repo-external-label
20+
load("@rules_java//java/bazel/rules:bazel_java_binary_wrapper.bzl", _java_binary = "java_binary")
21+
load("@rules_java//java/bazel/rules:bazel_java_import.bzl", _java_import = "java_import")
22+
load("@rules_java//java/bazel/rules:bazel_java_library.bzl", _java_library = "java_library")
23+
load("@rules_java//java/bazel/rules:bazel_java_plugin.bzl", _java_plugin = "java_plugin")
24+
load("@rules_java//java/bazel/rules:bazel_java_test.bzl", _java_test = "java_test")
25+
load("@rules_java//java/common/rules:java_package_configuration.bzl", _java_package_configuration = "java_package_configuration")
26+
load("@rules_java//java/common/rules:java_runtime.bzl", _java_runtime = "java_runtime")
27+
load("@rules_java//java/common/rules:java_toolchain.bzl", _java_toolchain = "java_toolchain")
28+
load("@rules_java//java/private:java_common.bzl", _java_common = "java_common")
29+
load("@rules_java//java/private:java_info.bzl", _JavaInfo = "JavaInfo", _JavaPluginInfo = "JavaPluginInfo")
30+
load("@rules_java//java:http_jar.bzl", _http_jar = "http_jar")
2531
2632
java_binary = _java_binary
2733
java_import = _java_import
@@ -43,7 +49,7 @@ http_jar = _http_jar
4349
"proxy.bzl",
4450
"""
4551
load("@bazel_tools//tools/build_defs/repo:http.bzl", _http_jar = "http_jar")
46-
load("@rules_java//java/private:native.bzl", "native_java_common", "NativeJavaInfo", "NativeJavaPluginInfo") # copybara-use-repo-external-label
52+
load("@rules_java//java/private:native.bzl", "native_java_common", "NativeJavaInfo", "NativeJavaPluginInfo")
4753
4854
java_binary = native.java_binary
4955
java_import = native.java_import

java/toolchains/BUILD

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ bzl_library(
1414
name = "toolchain_rules",
1515
srcs = glob(["*.bzl"]),
1616
visibility = ["//visibility:public"],
17-
deps = ["//java/private:native_bzl"],
17+
deps = [
18+
"//java/private:native_bzl",
19+
"@compatibility_proxy//:proxy_bzl",
20+
],
1821
)
1922

2023
filegroup(

0 commit comments

Comments
 (0)