Skip to content

Remove Java support: fully remove java support #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Remove Java support: fully remove java support #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,22 +52,6 @@ bazel build server \
--platforms=@buildbuddy_toolchain//:platform_linux_x86_64
```

## Java support

Bazel provides support for Java toolchains out of the box.
You can enabled the Java toolchain with the following flags:

```
--java_language_version=17
--tool_java_language_version=17
--java_runtime_version=remotejdk_17
--tool_java_runtime_version=remotejdk_17
```

Available verions are listed in [Bazel's User Manual](https://bazel.build/docs/user-manual#java-language-version)

If you need a custom Java toolchain, see Bazel's docs on [Java toolchain configuration](https://bazel.build/docs/bazel-and-java#config-java-toolchains).

## Linux image variants

The following Linux images are available for remote execution:
Expand All @@ -85,7 +69,6 @@ buildbuddy(name = "buildbuddy_toolchain", container_image = UBUNTU16_04_IMAGE)

This image includes the following build tools:

- Java 8 (javac 1.8.0_242)
- GCC 5.4.0
- GLIBC 2.23
- Clang/LLVM 11.0.0
Expand All @@ -105,7 +88,6 @@ buildbuddy(name = "buildbuddy_toolchain", container_image = UBUNTU20_04_IMAGE)

This image includes the following build tools:

- Java 11.0.17
- GCC 9.4.0
- GLIBC 2.31
- Clang/LLVM 15.0.0
Expand Down
19 changes: 3 additions & 16 deletions rules.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,6 @@ def _buildbuddy_toolchain_impl(rctx):
"%{default_platform}": default_platform,
"%{default_arch_constraint}": "aarch64" if rctx.os.arch == "aarch64" else "x86_64",
"%{default_arch_exec_property}": "arm64" if rctx.os.arch == "aarch64" else "amd64",
"%{java_version}": rctx.attr.java_version or default_tool_versions["java"],
# Handle removal of JDK8_JVM_OPTS in bazel 6.0.0:
# https://github.com/bazelbuild/bazel/commit/3a0a4f3b6931fbb6303fc98eec63d4434d8aece4
"%{jvm_opts_import}": '"JDK8_JVM_OPTS",' if native.bazel_version and native.bazel_version < "6.0.0" and rctx.attr.java_version == "8" else "",
"%{jvm_opts}": "JDK8_JVM_OPTS" if native.bazel_version and native.bazel_version < "6.0.0" and rctx.attr.java_version == "8" else '["-Xbootclasspath/p:$(location @remote_java_tools//:javac_jar)"]',
"%{msvc_edition}": rctx.attr.msvc_edition,
"%{msvc_release}": rctx.attr.msvc_release,
"%{msvc_version}": rctx.attr.msvc_version,
Expand Down Expand Up @@ -92,7 +87,6 @@ _buildbuddy_toolchain = repository_rule(
attrs = {
"llvm": attr.bool(),
"container_image": attr.string(),
"java_version": attr.string(),
"gcc_version": attr.string(),
"msvc_edition": attr.string(values = ["Community", "Professional", "Enterprise"]),
"msvc_release": attr.string(),
Expand Down Expand Up @@ -121,24 +115,17 @@ def buildbuddy(
name,
container_image = None,
llvm = False,
java_version = "",
gcc_version = "",
msvc_edition = "Community",
msvc_release = "2022",
msvc_version = "14.39.33519",
windows_kits_release = "10",
windows_kits_version = "10.0.22621.0",
extra_cxx_builtin_include_directories = []):
if java_version != "":
print("""
WARNING: java_version support in buildbuddy-toolchain is deprecated and will be removed in a future release.
Please visit https://www.buildbuddy.io/docs/rbe-setup#java-toolchain for the recommended Java toolchain setup.""")

_buildbuddy_toolchain(
name = name,
container_image = container_image,
llvm = llvm,
java_version = java_version,
gcc_version = gcc_version,
msvc_edition = msvc_edition,
msvc_release = msvc_release,
Expand All @@ -150,12 +137,12 @@ Please visit https://www.buildbuddy.io/docs/rbe-setup#java-toolchain for the rec

def _default_tool_versions(container_image):
if _is_same_repository(container_image, UBUNTU20_04_REPOSITORY):
return {"java": "11", "gcc": "9"}
return {"gcc": "9"}

if _is_same_repository(container_image, UBUNTU22_04_REPOSITORY):
return {"java": "11", "gcc": "11"}
return {"gcc": "11"}

return {"java": "8", "gcc": "5"}
return {"gcc": "5"}

def _is_same_repository(a, b):
"""Returns whether two repositories are the same (stripping tag or digest if necessary)."""
Expand Down
21 changes: 0 additions & 21 deletions templates/BUILD.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
load(
"@bazel_tools//tools/jdk:default_java_toolchain.bzl",
%{jvm_opts_import}
"default_java_toolchain",
"java_runtime_files",
)
load("@rules_cc//cc:defs.bzl", "cc_toolchain", "cc_toolchain_suite")
load(":cc_toolchain_config.bzl", "cc_toolchain_config")
load(":windows_cc_toolchain_config.bzl", windows_cc_toolchain_config = "cc_toolchain_config")
Expand Down Expand Up @@ -106,21 +100,6 @@ platform(
},
)

## Java %{java_version}

java_runtime(
name = "javabase",
srcs = [],
java_home = "/usr/lib/jvm/java-%{java_version}-openjdk-amd64",
)

default_java_toolchain(
name = "java_toolchain",
jvm_opts = %{jvm_opts},
source_version = "%{java_version}",
target_version = "%{java_version}",
)

## Defaults

alias(
Expand Down