commit 63c923800efcaec2c476e88f8f4ebf37df7bbffa
author cushon <cushon@google.com> Tue Jan 18 10:57:53 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Tue Jan 18 10:59:17 2022 -0800
tree 9b16799dcdf528dca7ecd2441a76003a1a4da70e
parent 35d9be34e4b19442a00167515342b211161be78a

Use JDK 11 for bootstrap build

which is necessary to enable the use of Java 11 language features.

PiperOrigin-RevId: 422598120

scripts/bootstrap/bootstrap.sh

diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh
index 597379b..2422236 100755
--- a/scripts/bootstrap/bootstrap.sh
+++ b/scripts/bootstrap/bootstrap.sh
@@ -29,7 +29,7 @@
     EMBED_LABEL_ARG=(--stamp --embed_label "${EMBED_LABEL}")
 fi
 
-: ${JAVA_VERSION:="1.8"}
+: ${JAVA_VERSION:="11"}
 
 _BAZEL_ARGS="--spawn_strategy=standalone \
       --nojava_header_compilation \

scripts/bootstrap/buildenv.sh

diff --git a/scripts/bootstrap/buildenv.sh b/scripts/bootstrap/buildenv.sh
index 5f0c003..f004805 100755
--- a/scripts/bootstrap/buildenv.sh
+++ b/scripts/bootstrap/buildenv.sh
@@ -77,7 +77,7 @@
 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 @@
 
 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)

src/main/java/com/google/devtools/build/lib/vfs/DigestHashFunction.java

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
index e8fdfbe..e760bb3 100644
--- 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 static boolean supportsClone(MessageDigest toCheck) {
     try {
-      Object unused = toCheck.clone();
+      var unused = toCheck.clone();
       return true;
     } catch (CloneNotSupportedException e) {
       return false;