Initial Java 18 toolchain support
Windows arm64 builds don't seem to be available yet, otherwise this
supports the same platforms as JDK 17.
https://github.com/bazelbuild/bazel/issues/14532
Closes #15119.
PiperOrigin-RevId: 438085556
diff --git a/WORKSPACE b/WORKSPACE
index f71d8d3..3fa4903 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -457,44 +457,18 @@
build_file = "@local_jdk//:BUILD.bazel",
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
-
)
-dist_http_archive(
- name = "remotejdk17_linux_for_testing",
- build_file = "@local_jdk//:BUILD.bazel",
- patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
- patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
-)
-
-dist_http_archive(
- name = "remotejdk17_macos_for_testing",
- build_file = "@local_jdk//:BUILD.bazel",
- patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
- patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
-)
-
-dist_http_archive(
- name = "remotejdk17_macos_aarch64_for_testing",
- build_file = "@local_jdk//:BUILD.bazel",
- patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
- patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
-)
-
-dist_http_archive(
- name = "remotejdk17_win_for_testing",
- build_file = "@local_jdk//:BUILD.bazel",
- patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
- patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
-)
-
-dist_http_archive(
- name = "remotejdk17_win_arm64_for_testing",
- build_file = "@local_jdk//:BUILD.bazel",
- patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
- patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
-
-)
+[
+ dist_http_archive(
+ name = "remotejdk%s_%s_for_testing" % (version, os),
+ build_file = "@local_jdk//:BUILD.bazel",
+ patch_cmds = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE,
+ patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_BAZEL_FILE_WIN,
+ )
+ for version in ("17", "18")
+ for os in ("linux", "macos", "macos_aarch64", "win", "win_arm64")
+]
# Used in src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE.
dist_http_archive(
@@ -641,6 +615,51 @@
""",
)
+# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
+dist_http_archive(
+ name = "openjdk18_linux_archive",
+ build_file_content = """
+java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
+exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
+""",
+)
+
+# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
+dist_http_archive(
+ name = "openjdk18_darwin_archive",
+ build_file_content = """
+java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
+exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
+""",
+)
+
+# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
+dist_http_archive(
+ name = "openjdk18_darwin_aarch64_archive",
+ build_file_content = """
+java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
+exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
+""",
+)
+
+# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
+dist_http_archive(
+ name = "openjdk18_windows_archive",
+ build_file_content = """
+java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
+exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
+""",
+)
+
+# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives.
+dist_http_archive(
+ name = "openjdk18_windows_arm64_archive",
+ build_file_content = """
+java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])
+exports_files(["WORKSPACE"], visibility = ["//visibility:public"])
+""",
+)
+
load("@io_bazel_skydoc//:setup.bzl", "stardoc_repositories")
stardoc_repositories()
