-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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:///<path to the java_tools_java14.zip>", ], ) ``` 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
- Loading branch information
1 parent
28ae455
commit fe291f7
Showing
10 changed files
with
344 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 <<EOF | ||
| load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") | ||
| # java_tools versions only used to test Bazel with various JDK toolchains. | ||
| http_archive( | ||
| name = "local_java_tools", | ||
| urls = ["${JAVA_TOOLS_ZIP_FILE_URL}"] | ||
| ) | ||
| EOF | ||
| cat $(rlocation io_bazel/src/test/shell/bazel/testdata/jdk_http_archives) >> WORKSPACE | ||
| } | ||
|
|
||
| function test_java14_record_type() { | ||
| mkdir -p java/main | ||
| cat >java/main/BUILD <<EOF | ||
| java_binary( | ||
| name = 'Javac14Example', | ||
| srcs = ['Javac14Example.java'], | ||
| main_class = 'Javac14Example', | ||
| javacopts = ["--enable-preview"], | ||
| jvm_flags = ["--enable-preview"], | ||
| ) | ||
| EOF | ||
|
|
||
| cat >java/main/Javac14Example.java <<EOF | ||
| 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); | ||
| } | ||
| } | ||
| EOF | ||
| bazel run java/main:Javac14Example --test_output=all --verbose_failures &>"${TEST_log}" | ||
| expect_log "0" | ||
| } | ||
|
|
||
| run_suite "Tests new Java 14 language features" |
Oops, something went wrong.