Skip to content

Commit dd3361f

Browse files
copybara-githubcopybara-github
committed
Merge pull request #94 from hvadehra:java_tools_v12
PiperOrigin-RevId: 518297768 Change-Id: Ie18de9d5d58b3cd11c01a223fccef6940b2497e8
2 parents 22e6c9f + ba257e1 commit dd3361f

File tree

4 files changed

+47
-20
lines changed

4 files changed

+47
-20
lines changed

‎MODULE.bazel‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module(
22
name = "rules_java",
3-
version = "5.4.1",
3+
version = "5.5.0",
44
compatibility_level = 1,
55
)
66

@@ -19,7 +19,8 @@ toolchains = use_extension("//java:extensions.bzl", "toolchains")
1919
use_repo(toolchains, "remote_java_tools")
2020
use_repo(toolchains, "remote_java_tools_linux")
2121
use_repo(toolchains, "remote_java_tools_windows")
22-
use_repo(toolchains, "remote_java_tools_darwin")
22+
use_repo(toolchains, "remote_java_tools_darwin_x86_64")
23+
use_repo(toolchains, "remote_java_tools_darwin_arm64")
2324

2425
# Declare local jdk repo
2526
use_repo(toolchains, "local_jdk")

‎java/defs.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ load("//java/private:native.bzl", "NativeJavaInfo", "NativeJavaPluginInfo", "nat
1818
# Do not touch: This line marks the end of loads; needed for PR importing.
1919

2020
_MIGRATION_TAG = "__JAVA_RULES_MIGRATION_DO_NOT_USE_WILL_BREAK__"
21-
version = "5.4.1"
21+
version = "5.5.0"
2222

2323
def _add_tags(attrs):
2424
if "tags" in attrs and attrs["tags"] != None:

‎java/repositories.bzl‎

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,43 +20,64 @@ load("//toolchains:local_java_repository.bzl", "local_java_repository")
2020
load("//toolchains:remote_java_repository.bzl", "remote_java_repository")
2121

2222
def java_tools_repos():
23+
""" Declares the remote java_tools repositories """
2324
maybe(
2425
http_archive,
2526
name = "remote_java_tools",
26-
sha256 = "af20366f926b1dadf8c084a51936116ef2f0db90e73e94b406c4ad8180f0788d",
27+
sha256 = "6efab6ca6e16e02c90e62bbd08ca65f61527984ab78564ea7ad7a2692b2ffdbb",
2728
urls = [
28-
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.12/java_tools-v11.12.zip",
29-
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.12/java_tools-v11.12.zip",
29+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.0/java_tools-v12.0.zip",
30+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.0/java_tools-v12.0.zip",
3031
],
3132
)
3233

3334
maybe(
3435
http_archive,
3536
name = "remote_java_tools_linux",
36-
sha256 = "37f79597f5b8c1501b9c66ded8ac68c61205ad39ef3ceda0e24fbd0afa3cd97f",
37+
sha256 = "4b8366b780387fc5ce69527ed287f2b444ee429d3325305ad062c92ac43c7fb6",
3738
urls = [
38-
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.12/java_tools_linux-v11.12.zip",
39-
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.12/java_tools_linux-v11.12.zip",
39+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.0/java_tools_linux-v12.0.zip",
40+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.0/java_tools_linux-v12.0.zip",
4041
],
4142
)
4243

4344
maybe(
4445
http_archive,
4546
name = "remote_java_tools_windows",
46-
sha256 = "43432ce4814513d6497661b4fede691982b3bdef7a1907808b096291f56a8001",
47+
sha256 = "7b938f0c67d9d390f10489b1b9a4dabb51e39ecc94532c3acdf8c4c16900457f",
4748
urls = [
48-
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.12/java_tools_windows-v11.12.zip",
49-
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.12/java_tools_windows-v11.12.zip",
49+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.0/java_tools_windows-v12.0.zip",
50+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.0/java_tools_windows-v12.0.zip",
5051
],
5152
)
5253

5354
maybe(
5455
http_archive,
5556
name = "remote_java_tools_darwin",
56-
sha256 = "aed319892b638efabd08405b8f835770e13e2465d20459876c5f457f2b6426f3",
57+
sha256 = "abc434be713ee9e1fd6525d7a7bd9d7cdff6e27ae3ca9d96420490e7ff6e28a3",
5758
urls = [
58-
"https://mirror.bazel.build/bazel_java_tools/releases/java/v11.12/java_tools_darwin-v11.12.zip",
59-
"https://github.com/bazelbuild/java_tools/releases/download/java_v11.12/java_tools_darwin-v11.12.zip",
59+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.0/java_tools_darwin_x86_64-v12.0.zip",
60+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.0/java_tools_darwin_x86_64-v12.0.zip",
61+
],
62+
)
63+
64+
maybe(
65+
http_archive,
66+
name = "remote_java_tools_darwin_x86_64",
67+
sha256 = "abc434be713ee9e1fd6525d7a7bd9d7cdff6e27ae3ca9d96420490e7ff6e28a3",
68+
urls = [
69+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.0/java_tools_darwin_x86_64-v12.0.zip",
70+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.0/java_tools_darwin_x86_64-v12.0.zip",
71+
],
72+
)
73+
74+
maybe(
75+
http_archive,
76+
name = "remote_java_tools_darwin_arm64",
77+
sha256 = "24a47a5557ee2ccdacd10a54fe4c15d627c6aeaf7596a5dccf2e11a866a5a32a",
78+
urls = [
79+
"https://mirror.bazel.build/bazel_java_tools/releases/java/v12.0/java_tools_darwin_arm64-v12.0.zip",
80+
"https://github.com/bazelbuild/java_tools/releases/download/java_v12.0/java_tools_darwin_arm64-v12.0.zip",
6081
],
6182
)
6283

‎toolchains/BUILD‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ cc_library(
126126
)
127127
for OS in [
128128
"linux",
129-
"darwin",
129+
"darwin_x86_64",
130+
"darwin_arm64",
130131
"windows",
131132
]
132133
]
@@ -142,7 +143,8 @@ alias(
142143
alias(
143144
name = "ijar_prebuilt_binary_or_cc_binary",
144145
actual = select({
145-
"@bazel_tools//src/conditions:darwin": ":ijar_prebuilt_binary_darwin",
146+
"@bazel_tools//src/conditions:darwin_arm64": ":ijar_prebuilt_binary_darwin_arm64",
147+
"@bazel_tools//src/conditions:darwin_x86_64": ":ijar_prebuilt_binary_darwin_x86_64",
146148
"@bazel_tools//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux",
147149
"@bazel_tools//src/conditions:windows": ":ijar_prebuilt_binary_windows",
148150
"//conditions:default": "@remote_java_tools//:ijar_cc_binary",
@@ -152,7 +154,8 @@ alias(
152154
alias(
153155
name = "ijar_prebuilt_binary",
154156
actual = select({
155-
"@bazel_tools//src/conditions:darwin": ":ijar_prebuilt_binary_darwin",
157+
"@bazel_tools//src/conditions:darwin_arm64": ":ijar_prebuilt_binary_darwin_arm64",
158+
"@bazel_tools//src/conditions:darwin_x86_64": ":ijar_prebuilt_binary_darwin_x86_64",
156159
"@bazel_tools//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux",
157160
"@bazel_tools//src/conditions:windows": ":ijar_prebuilt_binary_windows",
158161
}),
@@ -172,7 +175,8 @@ alias(
172175
alias(
173176
name = "singlejar_prebuilt_or_cc_binary",
174177
actual = select({
175-
"@bazel_tools//src/conditions:darwin": ":prebuilt_singlejar_darwin",
178+
"@bazel_tools//src/conditions:darwin_arm64": ":prebuilt_singlejar_darwin_arm64",
179+
"@bazel_tools//src/conditions:darwin_x86_64": ":prebuilt_singlejar_darwin_x86_64",
176180
"@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux",
177181
"@bazel_tools//src/conditions:windows": ":prebuilt_singlejar_windows",
178182
"//conditions:default": "@remote_java_tools//:singlejar_cc_bin",
@@ -182,7 +186,8 @@ alias(
182186
alias(
183187
name = "prebuilt_singlejar",
184188
actual = select({
185-
"@bazel_tools//src/conditions:darwin": ":prebuilt_singlejar_darwin",
189+
"@bazel_tools//src/conditions:darwin_arm64": ":prebuilt_singlejar_darwin_arm64",
190+
"@bazel_tools//src/conditions:darwin_x86_64": ":prebuilt_singlejar_darwin_x86_64",
186191
"@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux",
187192
"@bazel_tools//src/conditions:windows": ":prebuilt_singlejar_windows",
188193
}),

0 commit comments

Comments
 (0)