Build java_tools targetting java 8

bazelbuild · Apr 14, 2022 · 1905337 · 1905337
1 parent 187a545
commit 1905337
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -35,9 +35,5 @@ build:bzlmod --experimental_enable_bzlmod
 build:bzlmod --crosstool_top=@rules_cc.0.0.1.cc_configure.local_config_cc//:toolchain
 build:bzlmod --xcode_version_config=@rules_cc.0.0.1.cc_configure.local_config_xcode//:host_xcodes
 
-# Enable Java 11 language features (https://github.com/bazelbuild/bazel/issues/14592)
-build --java_language_version=11
-build --tool_java_language_version=11
-
 # User-specific .bazelrc
 try-import user.bazelrc
diff --git a/src/upload_all_java_tools.sh b/src/upload_all_java_tools.sh
@@ -75,7 +75,7 @@ fi
 if [[ "$platform" != "windows" ]]; then
  JAVA_VERSIONS=`cat src/test/shell/bazel/BUILD | grep '^JAVA_VERSIONS = ' | sed -e 's/JAVA_VERSIONS = //' | sed -e 's/["(),]//g'`
  for java_version in $JAVA_VERSIONS; do
- bazel test --verbose_failures --test_output=all --nocache_test_results \
+ bazel test --tool_java_language_version=11 --java_language_version=11 --verbose_failures --test_output=all --nocache_test_results \
  //src/test/shell/bazel:bazel_java_test_local_java_tools_jdk${java_version} \
  --define=LOCAL_JAVA_TOOLS_ZIP_URL="${file_url}" \
  --define=LOCAL_JAVA_TOOLS_PREBUILT_ZIP_URL="${prebuilt_file_url}"