Skip to content

Commit

Permalink
Bump version to 5.3.5, fix failures from 5.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
comius committed Nov 10, 2022
1 parent e4a3f07 commit 8ea6c07
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .bcr/presubmit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ tasks:
name: "Verify build targets"
platform: ${{ platform }}
build_targets:
- "@rules_java//..."
- "@rules_java//java/..."
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ filegroup(
"//java:srcs",
"//toolchains:srcs",
],
visibility = ["@//distro:__pkg__"],
visibility = ["//distro:__pkg__"],
)
4 changes: 2 additions & 2 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module(
name = "rules_java",
compatibility_level = 1,
version = "5.3.4",
version = "5.3.5",
)

bazel_dep(name = "platforms", version = "0.0.4")
bazel_dep(name = "rules_cc", version = "0.0.1")
bazel_dep(name = "rules_cc", version = "0.0.2")
bazel_dep(name = "bazel_skylib", version = "1.2.0")

# rules_proto is required by @remote_java_tools, which is loaded via module extension.
Expand Down
4 changes: 2 additions & 2 deletions java/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ licenses(["notice"])

filegroup(
name = "srcs",
srcs = glob(["**"]) + ["@//java/private:srcs"],
visibility = ["@//:__pkg__"],
srcs = glob(["**"]) + ["//java/private:srcs"],
visibility = ["//:__pkg__"],
)

bzl_library(
Expand Down
2 changes: 1 addition & 1 deletion java/defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ load("//java/private:native.bzl", "NativeJavaInfo", "NativeJavaPluginInfo", "nat
# Do not touch: This line marks the end of loads; needed for PR importing.

_MIGRATION_TAG = "__JAVA_RULES_MIGRATION_DO_NOT_USE_WILL_BREAK__"
version = "5.3.4"
version = "5.3.5"

def _add_tags(attrs):
if "tags" in attrs and attrs["tags"] != None:
Expand Down
4 changes: 2 additions & 2 deletions java/private/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ licenses(["notice"])
bzl_library(
name = "private",
srcs = ["native.bzl"],
visibility = ["@//java:__pkg__"],
visibility = ["//java:__pkg__"],
)

filegroup(
name = "srcs",
srcs = glob(["**"]),
visibility = ["@//java:__pkg__"],
visibility = ["//java:__pkg__"],
)
2 changes: 1 addition & 1 deletion toolchains/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ licenses(["notice"])
filegroup(
name = "srcs",
srcs = glob(["**"]),
visibility = ["@//:__pkg__"],
visibility = ["//:__pkg__"],
)

# Used to distinguish toolchains used for Java development, ie the JavaToolchainProvider.
Expand Down
2 changes: 2 additions & 0 deletions toolchains/default_java_toolchain.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ def java_runtime_files(name, srcs):
native.filegroup(
name = name,
srcs = srcs,
tags = ["manual"],
)
for src in srcs:
native.genrule(
Expand All @@ -185,6 +186,7 @@ def java_runtime_files(name, srcs):
toolchains = ["//toolchains:current_java_runtime"],
cmd = "cp $(JAVABASE)/%s $@" % src,
outs = [src],
tags = ["manual"],
)

def _bootclasspath_impl(ctx):
Expand Down

0 comments on commit 8ea6c07

Please sign in to comment.