Skip to content

Commit 402b184

Browse files
benjaminprules_java Copybara
benjaminp
authored and
rules_java Copybara
committed
upgrade java_tools to 17.0 and wire up linux aarch64 prebuilts (#334)
#173 Closes #334 COPYBARA_INTEGRATE_REVIEW=#334 from benjaminp:benjamin-java_tools 830727a PiperOrigin-RevId: 821564837 Change-Id: I97b1f8fdf8a409110701e112197c4977eab03b6a
1 parent 36264e4 commit 402b184

File tree

5 files changed

+33
-17
lines changed

5 files changed

+33
-17
lines changed

‎.bazelci/presubmit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ flags_workspace_integration: &flags_workspace_integration
4646
buildifier: latest
4747

4848
matrix:
49-
all_platforms: ["ubuntu2004", "macos", "macos_arm64", "windows"]
49+
all_platforms: ["rockylinux8_arm64", "ubuntu2004", "macos", "macos_arm64", "windows"]
5050
bazel: ["7.6.1", "8.4.0", "last_green"] # Bazel 6 tested separately, needs different flags
5151
modern_bazel: ["last_green", "rolling"] # Fully supported Bazel versions
5252

‎MODULE.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ toolchains = use_extension("//java:extensions.bzl", "toolchains")
3232
# Declare remote java tools repos
3333
use_repo(toolchains, "remote_java_tools")
3434
use_repo(toolchains, "remote_java_tools_linux")
35+
use_repo(toolchains, "remote_java_tools_linux_aarch64")
3536
use_repo(toolchains, "remote_java_tools_windows")
3637
use_repo(toolchains, "remote_java_tools_darwin_x86_64")
3738
use_repo(toolchains, "remote_java_tools_darwin_arm64")

‎java/repositories.bzl‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,33 +22,38 @@ load("//toolchains:remote_java_repository.bzl", "remote_java_repository")
2222

2323
# visible for tests
2424
JAVA_TOOLS_CONFIG = {
25-
"version": "v16.0",
25+
"version": "v17.0",
2626
"release": "true",
2727
"artifacts": {
2828
"java_tools_linux": {
29-
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v16.0/java_tools_linux-v16.0.zip",
30-
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v16.0/java_tools_linux-v16.0.zip",
31-
"sha": "7c360c60da9b9079e31f18de198f23a22555dfb7b6e91e3c6a7103127b1a8538",
29+
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v17.0/java_tools_linux-v17.0.zip",
30+
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v17.0/java_tools_linux-v17.0.zip",
31+
"sha": "5f89d5d04b41dbe1d661836b6a76c468113e0080953bcd72aaf6711c7462b86a",
32+
},
33+
"java_tools_linux_aarch64": {
34+
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v17.0/java_tools_linux_aarch64-v17.0.zip",
35+
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v17.0/java_tools_linux_aarch64-v17.0.zip",
36+
"sha": "c36a17057e895b260cb8f2f7961ed7480812ab6923dab5a39f0c93263e2f76f2",
3237
},
3338
"java_tools_windows": {
34-
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v16.0/java_tools_windows-v16.0.zip",
35-
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v16.0/java_tools_windows-v16.0.zip",
36-
"sha": "b41faa85fceeb2f852e48d51d000d3bf4f29da86ee61d0fc8cca46d297bccf22",
39+
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v17.0/java_tools_windows-v17.0.zip",
40+
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v17.0/java_tools_windows-v17.0.zip",
41+
"sha": "3ae5075b228ce464c74bd23602a65016f662895556fa8952cba2995d50904c86",
3742
},
3843
"java_tools_darwin_x86_64": {
39-
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v16.0/java_tools_darwin_x86_64-v16.0.zip",
40-
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v16.0/java_tools_darwin_x86_64-v16.0.zip",
41-
"sha": "a41de64afb663bb4880af52b55886098241b9222ee8ec1a0f6258d006ba247fb",
44+
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v17.0/java_tools_darwin_x86_64-v17.0.zip",
45+
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v17.0/java_tools_darwin_x86_64-v17.0.zip",
46+
"sha": "c65a181af0e723ed1a36c494aa0f70753f128adb7655a7b57f8f7e71217ad35c",
4247
},
4348
"java_tools_darwin_arm64": {
44-
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v16.0/java_tools_darwin_arm64-v16.0.zip",
45-
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v16.0/java_tools_darwin_arm64-v16.0.zip",
46-
"sha": "b79900dccca7c26fbae9a38c4da80987445e07194517ec53e169c45f1a88c7be",
49+
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v17.0/java_tools_darwin_arm64-v17.0.zip",
50+
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v17.0/java_tools_darwin_arm64-v17.0.zip",
51+
"sha": "00787917e359e2218953dbc30e228670e83fa20c4a0a5f914e0b6ecdee85fa9d",
4752
},
4853
"java_tools": {
49-
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v16.0/java_tools-v16.0.zip",
50-
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v16.0/java_tools-v16.0.zip",
51-
"sha": "d8b126078705e91677db67b05f7b25ad6fa8865949e2dd38ff85e0553bfb0be2",
54+
"mirror_url": "https://mirror.bazel.build/bazel_java_tools/releases/java/v17.0/java_tools-v17.0.zip",
55+
"github_url": "https://github.com/bazelbuild/java_tools/releases/download/java_v17.0/java_tools-v17.0.zip",
56+
"sha": "9a441ca2d4ae393edd305b0e465b0ed8ee86b22123c41c26455fb856bf9bc897",
5257
},
5358
},
5459
}

‎test/repo/MODULE.bazel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ use_repo(
2727
"remote_java_tools_darwin_arm64",
2828
"remote_java_tools_darwin_x86_64",
2929
"remote_java_tools_linux",
30+
"remote_java_tools_linux_aarch64",
3031
"remote_java_tools_windows",
3132
"remotejdk11_linux",
3233
"remotejdk11_linux_aarch64",

‎toolchains/BUILD‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ cc_library(
190190
)
191191
for OS in [
192192
"linux",
193+
"linux_aarch64",
193194
"darwin_x86_64",
194195
"darwin_arm64",
195196
"windows",
@@ -207,6 +208,7 @@ alias(
207208
"@bazel_tools//src/conditions:darwin_arm64": ":ijar_prebuilt_binary_darwin_arm64",
208209
"@bazel_tools//src/conditions:darwin_x86_64": ":ijar_prebuilt_binary_darwin_x86_64",
209210
"@bazel_tools//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux",
211+
"@bazel_tools//src/conditions:linux_aarch64": ":ijar_prebuilt_binary_linux_aarch64",
210212
"@bazel_tools//src/conditions:windows": ":ijar_prebuilt_binary_windows",
211213
"//conditions:default": "@remote_java_tools//:ijar_cc_binary",
212214
}),
@@ -218,6 +220,7 @@ alias(
218220
"@bazel_tools//src/conditions:darwin_arm64": ":ijar_prebuilt_binary_darwin_arm64",
219221
"@bazel_tools//src/conditions:darwin_x86_64": ":ijar_prebuilt_binary_darwin_x86_64",
220222
"@bazel_tools//src/conditions:linux_x86_64": ":ijar_prebuilt_binary_linux",
223+
"@bazel_tools//src/conditions:linux_aarch64": "ijar_prebuilt_binary_linux_aarch64",
221224
"@bazel_tools//src/conditions:windows": ":ijar_prebuilt_binary_windows",
222225
}),
223226
)
@@ -233,6 +236,7 @@ alias(
233236
"@bazel_tools//src/conditions:darwin_arm64": ":prebuilt_singlejar_darwin_arm64",
234237
"@bazel_tools//src/conditions:darwin_x86_64": ":prebuilt_singlejar_darwin_x86_64",
235238
"@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux",
239+
"@bazel_tools//src/conditions:linux_aarch64": ":prebuilt_singlejar_linux_aarch64",
236240
"@bazel_tools//src/conditions:windows": ":prebuilt_singlejar_windows",
237241
"//conditions:default": "@remote_java_tools//:singlejar_cc_bin",
238242
}),
@@ -244,6 +248,7 @@ alias(
244248
"@bazel_tools//src/conditions:darwin_arm64": ":prebuilt_singlejar_darwin_arm64",
245249
"@bazel_tools//src/conditions:darwin_x86_64": ":prebuilt_singlejar_darwin_x86_64",
246250
"@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_singlejar_linux",
251+
"@bazel_tools//src/conditions:linux_aarch64": ":prebuilt_singlejar_linux_aarch64",
247252
"@bazel_tools//src/conditions:windows": ":prebuilt_singlejar_windows",
248253
}),
249254
)
@@ -259,6 +264,7 @@ alias(
259264
"@bazel_tools//src/conditions:darwin_arm64": ":prebuilt_one_version_darwin_arm64",
260265
"@bazel_tools//src/conditions:darwin_x86_64": ":prebuilt_one_version_darwin_x86_64",
261266
"@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_one_version_linux",
267+
"@bazel_tools//src/conditions:linux_aarch64": ":prebuilt_one_version_linux_aarch64",
262268
"@bazel_tools//src/conditions:windows": ":prebuilt_one_version_windows",
263269
"//conditions:default": "@remote_java_tools//:one_version_cc_bin",
264270
}),
@@ -270,6 +276,7 @@ alias(
270276
"@bazel_tools//src/conditions:darwin_arm64": ":prebuilt_one_version_darwin_arm64",
271277
"@bazel_tools//src/conditions:darwin_x86_64": ":prebuilt_one_version_darwin_x86_64",
272278
"@bazel_tools//src/conditions:linux_x86_64": ":prebuilt_one_version_linux",
279+
"@bazel_tools//src/conditions:linux_aarch64": ":prebuilt_one_version_linux_aarch64",
273280
"@bazel_tools//src/conditions:windows": ":prebuilt_one_version_windows",
274281
}),
275282
)
@@ -285,6 +292,7 @@ alias(
285292
"@bazel_tools//src/conditions:darwin_arm64": ":turbine_direct_graal_darwin_arm64",
286293
"@bazel_tools//src/conditions:darwin_x86_64": ":turbine_direct_graal_darwin_x86_64",
287294
"@bazel_tools//src/conditions:linux_x86_64": ":turbine_direct_graal_linux",
295+
"@bazel_tools//src/conditions:linux_aarch64": ":turbine_direct_graal_linux_aarch64",
288296
"@bazel_tools//src/conditions:windows": ":turbine_direct_graal_windows",
289297
"//conditions:default": "@remote_java_tools//:TurbineDirect",
290298
}),
@@ -296,6 +304,7 @@ alias(
296304
"@bazel_tools//src/conditions:darwin_arm64": ":turbine_direct_graal_darwin_arm64",
297305
"@bazel_tools//src/conditions:darwin_x86_64": ":turbine_direct_graal_darwin_x86_64",
298306
"@bazel_tools//src/conditions:linux_x86_64": ":turbine_direct_graal_linux",
307+
"@bazel_tools//src/conditions:linux_aarch64": ":turbine_direct_graal_linux_aarch64",
299308
"@bazel_tools//src/conditions:windows": ":turbine_direct_graal_windows",
300309
}),
301310
)

0 commit comments

Comments
 (0)