Use JDK 11 for bootstrap build

which is necessary to enable the use of Java 11 language features. PiperOrigin-RevId: 422598120
echoOfqi · Jan 18, 2022 · 63c9238 · 63c9238
1 parent 35d9be3
commit 63c9238
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh
@@ -29,7 +29,7 @@ if [ -n "${EMBED_LABEL}" ]; then
     EMBED_LABEL_ARG=(--stamp --embed_label "${EMBED_LABEL}")
 fi
 
-: ${JAVA_VERSION:="1.8"}
+: ${JAVA_VERSION:="11"}
 
 _BAZEL_ARGS="--spawn_strategy=standalone \
       --nojava_header_compilation \

diff --git a/scripts/bootstrap/buildenv.sh b/scripts/bootstrap/buildenv.sh
@@ -77,7 +77,7 @@ function fail() {
 DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 WORKSPACE_DIR="$(dirname "$(dirname "${DIR}")")"
 
-JAVA_VERSION=${JAVA_VERSION:-1.8}
+JAVA_VERSION=${JAVA_VERSION:-11}
 BAZELRC=${BAZELRC:-"/dev/null"}
 PLATFORM="$(uname -s | tr 'A-Z' 'a-z')"
 
@@ -90,12 +90,12 @@ linux)
 
 freebsd)
   # JAVA_HOME must point to a Java installation.
-  JAVA_HOME="${JAVA_HOME:-/usr/local/openjdk8}"
+  JAVA_HOME="${JAVA_HOME:-/usr/local/openjdk11}"
   ;;
 
 openbsd)
   # JAVA_HOME must point to a Java installation.
-  JAVA_HOME="${JAVA_HOME:-/usr/local/jdk-1.8.0}"
+  JAVA_HOME="${JAVA_HOME:-/usr/local/jdk-11}"
   ;;
 
 darwin)

diff --git a/src/main/java/com/google/devtools/build/lib/vfs/DigestHashFunction.java b/src/main/java/com/google/devtools/build/lib/vfs/DigestHashFunction.java
@@ -187,7 +187,7 @@ private MessageDigest getMessageDigestInstance() {
 
   private static boolean supportsClone(MessageDigest toCheck) {
     try {
-      Object unused = toCheck.clone();
+      var unused = toCheck.clone();
       return true;
     } catch (CloneNotSupportedException e) {
       return false;