commit d2e5e550439babe3cd877e452ddf5fe1229f2b2c
author Matthias Sohn <matthias.sohn@gmail.com> Fri Jan 14 20:29:05 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 14 20:29:05 2022 +0000
tree 39e7c5574b118b519d0532c0a16030f65ccf0032
parent 953063612674c461a761f4b90d6b5e764e589cf4
parent f08cb4a25d27784d73ac746a28ae2591067a7b14

Merge "Sort subdirectories alphabetically"

.bazelrc

diff --git a/.bazelrc b/.bazelrc
index dde54fe..fb5f9d6 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -3,7 +3,7 @@
 build --experimental_strict_action_env
 build --action_env=PATH
 build --disk_cache=~/.gerritcodereview/bazel-cache/cas
-build --java_toolchain //tools:error_prone_warnings_toolchain
+build --java_toolchain //tools:error_prone_warnings_toolchain_java11
 
 test --build_tests_only
 test --test_output=errors

tools/BUILD

diff --git a/tools/BUILD b/tools/BUILD
index 5cfe48c..ec76f1b 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -1,14 +1,13 @@
 load(
     "@bazel_tools//tools/jdk:default_java_toolchain.bzl",
-    "JDK9_JVM_OPTS",
     "default_java_toolchain",
 )
 load("@rules_java//java:defs.bzl", "java_package_configuration")
 
 default_java_toolchain(
-    name = "error_prone_warnings_toolchain",
-    bootclasspath = ["@bazel_tools//tools/jdk:platformclasspath.jar"],
-    jvm_opts = JDK9_JVM_OPTS,
+    name = "error_prone_warnings_toolchain_java11",
+    source_version = "11",
+    target_version = "11",
     package_configuration = [
         ":error_prone",
     ],