Skip to content

Commit

Permalink
Add support for JDK 14
Browse files Browse the repository at this point in the history 
Closes #11017.

Test Plan:

1. Create java_tools from this commit:

  $ bazel build src:java_tools_java14.zip

2. Switch to using the java_tools from the above step in WORKSPACE file:

  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:

  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:

  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:

  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:

  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
  • Loading branch information
@davido
davido committed Jul 23, 2020
1 parent 3daedc3 commit 97b2bd9
Show file tree
Hide file tree
Showing 12 changed files with 756 additions and 44 deletions.
70 changes: 70 additions & 0 deletions WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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()
Expand Down
24 changes: 17 additions & 7 deletions src/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand All @@ -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)",
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down
32 changes: 32 additions & 0 deletions src/main/java/com/google/devtools/build/lib/bazel/rules/java/jdk.WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions src/test/py/bazel/test_base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
109 changes: 77 additions & 32 deletions src/test/shell/bazel/BUILD
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,30 @@ sh_test(
],
)

sh_test(
name = "bazel_java14_test",
srcs = ["bazel_java14_test.sh"],
tags = ["local"],
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",
],
)

sh_test(
name = "bazel_java_test",
# TODO(iirina): Investigate if the 'large' and 'eternal' values still apply.
Expand All @@ -196,7 +220,58 @@ sh_test(
exec_compatible_with = ["//:highcpu_machine"],
)

JAVA_VERSIONS = ("11",)
sh_test(
name = "bazel_java_tools_dist_javac11_test",
size = "small",
srcs = ["bazel_java_tools_dist_test.sh"],
args = ["javac11"],
data = [
":test-deps",
"//src:java_tools_dist_javac11.zip",
"@bazel_tools//tools/bash/runfiles",
],
)

sh_test(
name = "bazel_java_tools_dist_javac14_test",
size = "small",
srcs = ["bazel_java_tools_dist_without_javac_test.sh"],
args = ["javac14"],
data = [
":test-deps",
"//src:java_tools_dist_javac14.zip",
"@bazel_tools//tools/bash/runfiles",
],
)

sh_test(
name = "bazel_java_tools_javac11_test",
size = "medium",
srcs = ["bazel_java_tools_test.sh"],
args = ["java11"],
data = [
":test-deps",
"//src:java_tools_java11.zip",
"@bazel_tools//tools/bash/runfiles",
],
)

sh_test(
name = "bazel_java_tools_javac14_test",
size = "medium",
srcs = ["bazel_java_tools_without_javac_test.sh"],
args = ["java11"],
data = [
":test-deps",
"//src:java_tools_java11.zip",
"@bazel_tools//tools/bash/runfiles",
],
)

JAVA_VERSIONS = ("11", "14")

# TODO(davido): Remove this once remote_java_tools_javac14 is released
JAVA_TOOLS_VERSIONS = ("11",)

[
sh_test(
Expand Down Expand Up @@ -297,36 +372,6 @@ sh_test(
tags = ["no_windows"],
)

[
sh_test(
name = "bazel_java_tools_javac" + java_version + "_test",
size = "medium",
srcs = ["bazel_java_tools_test.sh"],
args = ["java" + java_version],
data = [
":test-deps",
"//src:java_tools_java" + java_version + ".zip",
"@bazel_tools//tools/bash/runfiles",
],
)
for java_version in JAVA_VERSIONS
]

[
sh_test(
name = "bazel_java_tools_dist_javac" + java_version + "_test",
size = "small",
srcs = ["bazel_java_tools_dist_test.sh"],
args = ["javac" + java_version],
data = [
":test-deps",
"//src:java_tools_dist_javac" + java_version + ".zip",
"@bazel_tools//tools/bash/runfiles",
],
)
for java_version in JAVA_VERSIONS
]

sh_test(
name = "bazel_proto_library_test",
size = "large", # Downloads and compiles protobuf for *every* *test* *case*
Expand Down Expand Up @@ -467,7 +512,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.
Expand Down
Loading

0 comments on commit 97b2bd9

Please sign in to comment.