From fe291f7dcadc20eb85cff07b2cd4d899d79fba71 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 23 Jul 2020 04:08:29 -0700 Subject: [PATCH] Add support for toolchain java 14 Closes #11017. Test Plan: 1. Create java_tools from this commit: ```bash $ bazel build src:java_tools_java14.zip ``` 2. Switch to using the java_tools from the above step in WORKSPACE file: ```python load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "remote_java_tools_linux", urls = [ "file:///", ], ) ``` 3. Add Zulu OpenJDK14 to use as javabase in WORKSPACE file: ```python http_archive( name = "openjdk14_linux_archive", build_file_content = """ java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public']) exports_files(["WORKSPACE"], visibility = ["//visibility:public"]) """, sha256 = "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", strip_prefix = "zulu14.28.21-ca-jdk14.0.1-linux_x64", urls = ["https://cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"], ) ``` 4. Activate custom java toolchain and javabase in .bazelrc file: ```bash build --java_toolchain=@remote_java_tools_linux//:toolchain_jdk_14 build --host_java_toolchain=@remote_java_tools_linux//:toolchain_jdk_14 build --javabase=@openjdk14_linux_archive//:runtime build --host_javabase=@openjdk14_linux_archive//:runtime ``` 5. Create Java 14 example class file: ```java public class Javac14Example { record Point(int x, int y) {} public static void main(String[] args) { Point point = new Point(0, 1); System.out.println(point.x); } } ``` 6. Add Bazel file to build Java 14 syntax class with activated preview features: ```python java_binary( name = "Javac14Example", srcs = ["Javac14Example.java"], javacopts = ["--enable-preview"], jvm_flags = ["--enable-preview"], main_class = "Javac14Example", ) ``` 7. Test that it works as expected: ``` $ bazel run java:Javac14Example INFO: Analyzed target //java:Javac14Example (1 packages loaded, 2 targets configured). INFO: Found 1 target... INFO: From Building java/Javac14Example.jar (1 source file): Note: java/Javac14Example.java uses preview language features. Note: Recompile with -Xlint:preview for details. Target //java:Javac14Example up-to-date: bazel-bin/java/Javac14Example.jar bazel-bin/java/Javac14Example INFO: Elapsed time: 1.502s, Critical Path: 1.30s INFO: 1 process: 1 worker. INFO: Build completed successfully, 2 total actions INFO: Build completed successfully, 2 total actions 0 ``` Closes #11514. PiperOrigin-RevId: 322759522 --- WORKSPACE | 70 +++++++++++ src/BUILD | 24 ++-- .../build/lib/bazel/rules/java/jdk.WORKSPACE | 32 +++++ src/test/py/bazel/test_base.py | 3 + src/test/shell/bazel/BUILD | 31 ++++- src/test/shell/bazel/bazel_java14_test.sh | 116 ++++++++++++++++++ .../shell/bazel/testdata/jdk_http_archives | 26 ++++ src/test/shell/testenv.sh | 6 + src/upload_all_java_tools.sh | 2 +- tools/jdk/BUILD.java_tools | 48 +++++++- 10 files changed, 344 insertions(+), 14 deletions(-) create mode 100755 src/test/shell/bazel/bazel_java14_test.sh diff --git a/WORKSPACE b/WORKSPACE index 6fe9fdea89dbc1..815adc8b01763f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -701,6 +701,7 @@ http_archive( ], ) + # This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_remote_tools.WORKSPACE http_archive( name = "android_tools_for_testing", @@ -779,6 +780,39 @@ http_archive( urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"], ) +# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE. +http_archive( + name = "remotejdk14_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, + sha256 = "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-linux_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"], +) + +# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE. +http_archive( + name = "remotejdk14_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, + sha256 = "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"], +) + +# This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE. +http_archive( + name = "remotejdk14_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, + sha256 = "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-win_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"], +) + # This must be kept in sync with src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE. http_archive( name = "remote_java_tools_linux_for_testing", @@ -884,6 +918,42 @@ exports_files(["WORKSPACE"], visibility = ["//visibility:public"]) urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"], ) +# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives. +http_archive( + name = "openjdk14_linux_archive", + build_file_content = """ +java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public']) +exports_files(["WORKSPACE"], visibility = ["//visibility:public"]) +""", + sha256 = "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-linux_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"], +) + +# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives. +http_archive( + name = "openjdk14_darwin_archive", + build_file_content = """ +java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public']) +exports_files(["WORKSPACE"], visibility = ["//visibility:public"]) +""", + sha256 = "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"], +) + +# This must be kept in sync with src/test/shell/bazel/testdata/jdk_http_archives. +http_archive( + name = "openjdk14_windows_archive", + build_file_content = """ +java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public']) +exports_files(["WORKSPACE"], visibility = ["//visibility:public"]) +""", + sha256 = "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-win_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"], +) + load("@io_bazel_skydoc//:setup.bzl", "stardoc_repositories") stardoc_repositories() diff --git a/src/BUILD b/src/BUILD index 2b9f3cc2c2d341..204dc18110c2a0 100644 --- a/src/BUILD +++ b/src/BUILD @@ -567,15 +567,17 @@ JAVA_TOOLS_DEPLOY_JARS = [ "//conditions:default": [], }) -JAVA_VERSIONS = ("11",) +JAVA_VERSIONS = ("11", "14") + +# TODO(davido): Hard code the javac 11 for now; it is required for default toolchain. [ genrule( name = "jars_java_tools_java" + java_version + "_zip", srcs = JAVA_TOOLS_DEPLOY_JARS + [ - "@java_tools_langtools_javac" + java_version + "//:jdk_compiler_jar", - "@java_tools_langtools_javac" + java_version + "//:java_compiler_jar", - "@java_tools_langtools_javac" + java_version + "//:javac_jar", + "@java_tools_langtools_javac11//:jdk_compiler_jar", + "@java_tools_langtools_javac11//:java_compiler_jar", + "@java_tools_langtools_javac11//:javac_jar", ], outs = ["jars_java_tools_java" + java_version + ".zip"], cmd = "zip -qjX $@ $$(echo $(SRCS) | sort)", @@ -598,7 +600,7 @@ JAVA_VERSIONS = ("11",) "//third_party/ijar:transitive_sources", "//third_party/java/jacoco:transitive_sources", "//third_party/java/proguard:srcs", - "@java_tools_langtools_javac" + java_version + "//:srcs", + "@java_tools_langtools_javac11//:srcs", ], outs = ["java_tools_dist_javac" + java_version + ".zip"], cmd = "zip -qXr $@ $$(echo $(SRCS) | sort)", @@ -638,8 +640,10 @@ JAVA_VERSIONS = ("11",) [ # The java_tools releases can have BUILD files that vary depending on the # javac version they embed. Currently the only difference is in the - # java_toolchain source version which has to be 12 for javac 12 to be able - # to build new Java 12 features. + # java_toolchain source version which has to be 14 for javac 14 to be able + # to build new Java 14 features. This is not used atm, as the toolchain for + # javac 14 was duplicated, but it might be used in future Bazel releases to + # support new javac release, so that we preserve this step for now. genrule( name = "create_java_tools_build_java" + java_version, srcs = ["//tools/jdk:BUILD.java_tools"], @@ -744,6 +748,9 @@ filegroup( "@openjdk11_darwin_archive//:WORKSPACE", "@openjdk11_linux_archive//:WORKSPACE", "@openjdk11_windows_archive//:WORKSPACE", + "@openjdk14_darwin_archive//:WORKSPACE", + "@openjdk14_linux_archive//:WORKSPACE", + "@openjdk14_windows_archive//:WORKSPACE", "@openjdk_linux_aarch64_minimal//file", "@openjdk_linux_minimal//file", "@openjdk_macos_minimal//file", @@ -760,6 +767,9 @@ filegroup( "@remotejdk11_linux_ppc64le_for_testing//:WORKSPACE", "@remotejdk11_macos_for_testing//:WORKSPACE", "@remotejdk11_win_for_testing//:WORKSPACE", + "@remotejdk14_linux_for_testing//:WORKSPACE", + "@remotejdk14_macos_for_testing//:WORKSPACE", + "@remotejdk14_win_for_testing//:WORKSPACE", "@rules_cc//:WORKSPACE", "@rules_java//:WORKSPACE", "@rules_pkg//:WORKSPACE", diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE index 91823eb5448003..c62cf98b9380dd 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE @@ -154,6 +154,38 @@ maybe( ], ) +# This must be kept in sync with the top-level WORKSPACE file. +maybe( + http_archive, + name = "remotejdk14_linux", + build_file = "@local_jdk//:BUILD.bazel", + sha256 = "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-linux_x64", + urls = [ + "https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz", + ], +) + +# This must be kept in sync with the top-level WORKSPACE file. +maybe( + http_archive, + name = "remotejdk14_macos", + build_file = "@local_jdk//:BUILD.bazel", + sha256 = "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"], +) + +# This must be kept in sync with the top-level WORKSPACE file. +maybe( + http_archive, + name = "remotejdk14_win", + build_file = "@local_jdk//:BUILD.bazel", + sha256 = "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-win_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"], +) + # This must be kept in sync with the top-level WORKSPACE file. maybe( http_archive, diff --git a/src/test/py/bazel/test_base.py b/src/test/py/bazel/test_base.py index 1909afeb6d488a..baf730325a1c7c 100644 --- a/src/test/py/bazel/test_base.py +++ b/src/test/py/bazel/test_base.py @@ -61,6 +61,9 @@ class TestBase(unittest.TestCase): 'remotejdk11_linux_ppc64le_for_testing', 'remotejdk11_macos_for_testing', 'remotejdk11_win_for_testing', + 'remotejdk14_linux_for_testing', + 'remotejdk14_macos_for_testing', + 'remotejdk14_win_for_testing', 'remote_java_tools_darwin_for_testing', 'remote_java_tools_linux_for_testing', 'remote_java_tools_windows_for_testing', diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index 26feef3dc4fac8..e81f8bac5c9b92 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -178,6 +178,30 @@ sh_test( ], ) +sh_test( + name = "bazel_java14_test", + srcs = ["bazel_java14_test.sh"], + args = [ + # --java_toolchain and --host_java_toolchain values + "@local_java_tools//:toolchain_jdk_14", + # java_tools zip to test + "src/java_tools_java14.zip", + ] + select({ + # --javabase and --host_javabase values + "//src/conditions:darwin": ["@openjdk14_darwin_archive//:runtime"], + "//src/conditions:darwin_x86_64": ["@openjdk14_darwin_archive//:runtime"], + "//src/conditions:windows": ["@openjdk14_windows_archive//:runtime"], + "//src/conditions:linux_x86_64": ["@openjdk14_linux_archive//:runtime"], + }), + data = [ + ":test-deps", + "//src:java_tools_java14_zip", + "//src/test/shell/bazel/testdata:jdk_http_archives_filegroup", + "@bazel_tools//tools/bash/runfiles", + ], + tags = ["local"], +) + sh_test( name = "bazel_java_test", # TODO(iirina): Investigate if the 'large' and 'eternal' values still apply. @@ -196,7 +220,10 @@ sh_test( exec_compatible_with = ["//:highcpu_machine"], ) -JAVA_VERSIONS = ("11",) +JAVA_VERSIONS = ("11", "14") + +# TODO(davido): Remove this once remote_java_tools_javac14 is released +JAVA_TOOLS_VERSIONS = ("11",) [ sh_test( @@ -467,7 +494,7 @@ sh_test( "no_windows", ], ) - for java_version in JAVA_VERSIONS + for java_version in JAVA_TOOLS_VERSIONS ] # Test java coverage with the java_toolchain in the java_tools zip built at head. diff --git a/src/test/shell/bazel/bazel_java14_test.sh b/src/test/shell/bazel/bazel_java14_test.sh new file mode 100755 index 00000000000000..ed820373c2741c --- /dev/null +++ b/src/test/shell/bazel/bazel_java14_test.sh @@ -0,0 +1,116 @@ +#!/bin/bash +# +# Copyright 2020 The Bazel Authors. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Tests that bazel runs projects with Java 14 features. + +# --- begin runfiles.bash initialization --- +if [[ ! -d "${RUNFILES_DIR:-/dev/null}" && ! -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then + if [[ -f "$0.runfiles_manifest" ]]; then + export RUNFILES_MANIFEST_FILE="$0.runfiles_manifest" + elif [[ -f "$0.runfiles/MANIFEST" ]]; then + export RUNFILES_MANIFEST_FILE="$0.runfiles/MANIFEST" + elif [[ -f "$0.runfiles/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then + export RUNFILES_DIR="$0.runfiles" + fi +fi +if [[ -f "${RUNFILES_DIR:-/dev/null}/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then + source "${RUNFILES_DIR}/bazel_tools/tools/bash/runfiles/runfiles.bash" +elif [[ -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then + source "$(grep -m1 "^bazel_tools/tools/bash/runfiles/runfiles.bash " \ + "$RUNFILES_MANIFEST_FILE" | cut -d ' ' -f 2-)" +else + echo >&2 "ERROR: cannot find @bazel_tools//tools/bash/runfiles:runfiles.bash" + exit 1 +fi +# --- end runfiles.bash initialization --- + +source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \ + || { echo "integration_test_setup.sh not found!" >&2; exit 1; } + +case "$(uname -s | tr [:upper:] [:lower:])" in +msys*|mingw*|cygwin*) + declare -r is_windows=true + ;; +*) + declare -r is_windows=false + ;; +esac + +if "$is_windows"; then + export MSYS_NO_PATHCONV=1 + export MSYS2_ARG_CONV_EXCL="*" +fi + +JAVA_TOOLCHAIN="$1"; shift +JAVA_TOOLS_ZIP="$1"; shift +JAVA_RUNTIME="$1"; shift + +echo "JAVA_TOOLS_ZIP=$JAVA_TOOLS_ZIP" + + +JAVA_TOOLS_RLOCATION=$(rlocation io_bazel/$JAVA_TOOLS_ZIP) + +if "$is_windows"; then + JAVA_TOOLS_ZIP_FILE_URL="file:///${JAVA_TOOLS_RLOCATION}" +else + JAVA_TOOLS_ZIP_FILE_URL="file://${JAVA_TOOLS_RLOCATION}" +fi +JAVA_TOOLS_ZIP_FILE_URL=${JAVA_TOOLS_ZIP_FILE_URL:-} + +add_to_bazelrc "build --java_toolchain=${JAVA_TOOLCHAIN}" +add_to_bazelrc "build --host_java_toolchain=${JAVA_TOOLCHAIN}" +add_to_bazelrc "build --javabase=${JAVA_RUNTIME}" +add_to_bazelrc "build --host_javabase=${JAVA_RUNTIME}" + +function set_up() { + cat >>WORKSPACE <> WORKSPACE +} + +function test_java14_record_type() { + mkdir -p java/main + cat >java/main/BUILD <java/main/Javac14Example.java <"${TEST_log}" + expect_log "0" +} + +run_suite "Tests new Java 14 language features" diff --git a/src/test/shell/bazel/testdata/jdk_http_archives b/src/test/shell/bazel/testdata/jdk_http_archives index 4a24878ee49739..1618193264770a 100644 --- a/src/test/shell/bazel/testdata/jdk_http_archives +++ b/src/test/shell/bazel/testdata/jdk_http_archives @@ -49,3 +49,29 @@ http_archive( strip_prefix = "zulu11.37.17-ca-jdk11.0.6-win_x64", urls = ["https://mirror.bazel.build/openjdk/azul-zulu11.37.17-ca-jdk11.0.6/zulu11.37.17-ca-jdk11.0.6-win_x64.zip"], ) + +#################################### JDK 14 #################################### +# This must be kept in sync with the top-level WORKSPACE file. +http_archive( + name = "openjdk14_linux_archive", + build_file_content = "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + sha256 = "48bb8947034cd079ad1ef83335e7634db4b12a26743a0dc314b6b861480777aa", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-linux_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-linux_x64.tar.gz"], +) +# This must be kept in sync with the top-level WORKSPACE file. +http_archive( + name = "openjdk14_darwin_archive", + build_file_content = "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + sha256 = "088bd4d0890acc9f032b738283bf0f26b2a55c50b02d1c8a12c451d8ddf080dd", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-macosx_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-macosx_x64.tar.gz"], +) +# This must be kept in sync with the top-level WORKSPACE file. +http_archive( + name = "openjdk14_windows_archive", + build_file_content = "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + sha256 = "9cb078b5026a900d61239c866161f0d9558ec759aa15c5b4c7e905370e868284", + strip_prefix = "zulu14.28.21-ca-jdk14.0.1-win_x64", + urls = ["https://mirror.bazel.build/cdn.azul.com/zulu/bin/zulu14.28.21-ca-jdk14.0.1-win_x64.zip"], +) diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index 248baf50d1516b..a1cbb9d4a24afa 100755 --- a/src/test/shell/testenv.sh +++ b/src/test/shell/testenv.sh @@ -280,6 +280,9 @@ EOF "openjdk11_darwin_archive" "openjdk11_linux_archive" "openjdk11_windows_archive" + "openjdk14_darwin_archive" + "openjdk14_linux_archive" + "openjdk14_windows_archive" "openjdk_linux_aarch64_minimal" "openjdk_linux_minimal" "openjdk_macos_minimal" @@ -296,6 +299,9 @@ EOF "remotejdk11_linux_ppc64le_for_testing" "remotejdk11_macos_for_testing" "remotejdk11_win_for_testing" + "remotejdk14_linux_for_testing" + "remotejdk14_macos_for_testing" + "remotejdk14_win_for_testing" "rules_cc" "rules_java" "rules_pkg" diff --git a/src/upload_all_java_tools.sh b/src/upload_all_java_tools.sh index e96fd01d5f3ce4..3c79696f852f70 100755 --- a/src/upload_all_java_tools.sh +++ b/src/upload_all_java_tools.sh @@ -48,7 +48,7 @@ bazel_version=$(bazel info release | cut -d' ' -f2) # Passing the same commit_hash and timestamp to all targets to mark all the artifacts # uploaded on GCS with the same identifier. -for java_version in 11; do +for java_version in 11 14; do bazel build //src:java_tools_java${java_version}_zip zip_path=${PWD}/bazel-bin/src/java_tools_java${java_version}.zip diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools index 2315eec40e13cc..2f7462bc9d66af 100644 --- a/tools/jdk/BUILD.java_tools +++ b/tools/jdk/BUILD.java_tools @@ -66,9 +66,9 @@ java_toolchain( ], ) -# A toolchain that targets java JAVA_LANGUAGE_LEVEL. +# A toolchain that targets java 11. java_toolchain( - name = "toolchain_jdk_JAVA_LANGUAGE_LEVEL", + name = "toolchain_jdk_11", bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"], forcibly_disable_header_compilation = 0, genclass = [":GenClass"], @@ -84,6 +84,7 @@ java_toolchain( # when using G1 collector and having compact strings enabled. "-XX:+UseParallelOldGC", "-XX:-CompactStrings", + # Allow JavaBuilder to access internal javac APIs. "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED", @@ -110,14 +111,53 @@ java_toolchain( "-parameters", ], singlejar = [":singlejar"], - source_version = "JAVA_LANGUAGE_LEVEL", - target_version = "JAVA_LANGUAGE_LEVEL", + source_version = "11", + target_version = "11", tools = [ ":java_compiler_jar", ":jdk_compiler_jar", ], ) +# A toolchain that targets java 14. +java_toolchain( + name = "toolchain_jdk_14", + bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath"], + forcibly_disable_header_compilation = 0, + genclass = [":GenClass"], + header_compiler = [":Turbine"], + header_compiler_direct = [":TurbineDirect"], + ijar = [":ijar"], + jacocorunner = ":jacoco_coverage_runner_filegroup", + javabuilder = [":JavaBuilder"], + javac_supports_workers = 1, + jvm_opts = [ + # Allow JavaBuilder to access internal javac APIs. + "--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED", + "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", + "--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED", + + # quiet warnings from com.google.protobuf.UnsafeUtil, + # see: https://github.com/google/protobuf/issues/3781 + # and: https://github.com/bazelbuild/bazel/issues/5599 + "--add-opens=java.base/java.nio=ALL-UNNAMED", + "--add-opens=java.base/java.lang=ALL-UNNAMED", + ], + misc = [ + "-XDskipDuplicateBridges=true", + "-g", + "-parameters", + ], + singlejar = [":singlejar"], + source_version = "14", + target_version = "14", +) + # The new toolchain is using all the pre-built tools, including # singlejar and ijar, even on remote execution. This toolchain # should be used only when host and execution platform are the