Update to support Java 17
Support class files with version 61.
Move all use of JDK 16 for testing new features to JDK 17,
leaving JDK 16 not used for testing any more.
Removed all use of --enable-preview, as no tested features are
preview on JDK 17.
Content of README.google:
Name: Java Development Kit (JDK)
URL: https://jdk.java.net/17/
Version: 17
Revision: NA
License: the GNU General Public License, version 2, with the Classpath Exception.
Description:
This is pulled directly from the website for the JDK releases that has an open source license.
Synlinks have reen resolved using `cp -rL` before uploading.
Change-Id: I9526ce07e8911c21d5ad75b628fa4ab6fe9c2f9f
diff --git a/scripts/add-openjdk.sh b/scripts/add-openjdk.sh
old mode 100644
new mode 100755
index 8587b93..6f8bada
--- a/scripts/add-openjdk.sh
+++ b/scripts/add-openjdk.sh
@@ -16,9 +16,9 @@
# Prepare README.google
# Update JDK_VERSION below
-# Now run script wit fingers crossed!
+# Now run script with fingers crossed!
-JDK_VERSION=16.0.2
+JDK_VERSION=17
tar xf ~/Downloads/openjdk-${JDK_VERSION}_linux-x64_bin.tar.gz
cp -rL jdk-${JDK_VERSION} linux
@@ -28,7 +28,7 @@
rm -rf linux
rm linux.tar.gz
-tar xf ~/Downloads/openjdk-${JDK_VERSION}_osx-x64_bin.tar.gz
+tar xf ~/Downloads/openjdk-${JDK_VERSION}_macos-x64_bin.tar.gz
cp -rL jdk-${JDK_VERSION}.jdk osx
cp README.google osx
upload_to_google_storage.py -a --bucket r8-deps osx
@@ -43,3 +43,7 @@
rm -rf windows
rm -rf jdk-${JDK_VERSION}
rm windows.tar.gz
+
+git add *.sha1
+
+echo "Update additional files, see https://r8-review.googlesource.com/c/r8/+/61909"
\ No newline at end of file
