From 98db85985b1ff6a57bd9e58fefa028a710c74b61 Mon Sep 17 00:00:00 2001 From: George Fraser Date: Fri, 7 Jul 2023 09:33:18 -0700 Subject: [PATCH] Testing java 20 --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- pom.xml | 4 ++-- scripts/build.sh | 4 ++-- scripts/download_linux_jdk.sh | 4 ++-- scripts/download_mac_jdk.sh | 4 ++-- scripts/download_windows_jdk.sh | 4 ++-- scripts/link_linux.sh | 2 +- scripts/link_mac.sh | 2 +- scripts/link_windows.sh | 2 +- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a7711159..aad2bfa3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: '18' + java-version: '20' distribution: 'temurin' cache: maven - name: Set up Node diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ba76fef5..e4bf8a09 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: - name: Set up JDK uses: actions/setup-java@v3 with: - java-version: '18' + java-version: '20' distribution: 'temurin' cache: maven - name: Run Java tests diff --git a/pom.xml b/pom.xml index a448b270..e2a8a4b1 100644 --- a/pom.xml +++ b/pom.xml @@ -116,8 +116,8 @@ maven-compiler-plugin 3.8.0 - 18 - 18 + 20 + 20 --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED diff --git a/scripts/build.sh b/scripts/build.sh index 3b01e0e2..0471fd07 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -8,10 +8,10 @@ if [ ! -e node_modules ]; then fi # Build standalone java -if [ ! -e jdks/linux/jdk-18 ]; then +if [ ! -e jdks/linux/jdk-20 ]; then ./scripts/download_linux_jdk.sh fi -if [ ! -e jdks/windows/jdk-18 ]; then +if [ ! -e jdks/windows/jdk-20 ]; then ./scripts/download_windows_jdk.sh fi if [ ! -e dist/linux/bin/java ]; then diff --git a/scripts/download_linux_jdk.sh b/scripts/download_linux_jdk.sh index f3a852af..c922a369 100755 --- a/scripts/download_linux_jdk.sh +++ b/scripts/download_linux_jdk.sh @@ -6,8 +6,8 @@ set -e # Download linux jdk mkdir -p jdks/linux cd jdks/linux -curl https://download.java.net/java/GA/jdk18.0.1.1/65ae32619e2f40f3a9af3af1851d6e19/2/GPL/openjdk-18.0.1.1_linux-x64_bin.tar.gz > linux.tar.gz +curl https://download.java.net/java/GA/jdk20.0.1/b4887098932d415489976708ad6d1a4b/9/GPL/openjdk-20.0.1_linux-aarch64_bin.tar.gz > linux.tar.gz gunzip -c linux.tar.gz | tar xopf - rm linux.tar.gz -mv jdk-18.0.1.1 jdk-18 +mv jdk-20.0.1.1 jdk-20 cd ../.. \ No newline at end of file diff --git a/scripts/download_mac_jdk.sh b/scripts/download_mac_jdk.sh index 3a843cae..8d9e1e0b 100755 --- a/scripts/download_mac_jdk.sh +++ b/scripts/download_mac_jdk.sh @@ -6,8 +6,8 @@ set -e # Download mac jdk mkdir -p jdks/mac cd jdks/mac -curl https://download.java.net/java/GA/jdk18.0.1.1/65ae32619e2f40f3a9af3af1851d6e19/2/GPL/openjdk-18.0.1.1_macos-x64_bin.tar.gz > mac.tar.gz +curl https://download.java.net/java/GA/jdk20.0.1/b4887098932d415489976708ad6d1a4b/9/GPL/openjdk-20.0.1_macos-x64_bin.tar.gz > mac.tar.gz gunzip -c mac.tar.gz | tar xopf - rm mac.tar.gz -mv jdk-18.0.1.1.jdk jdk-18 +mv jdk-20.0.1.1.jdk jdk-20 cd ../.. \ No newline at end of file diff --git a/scripts/download_windows_jdk.sh b/scripts/download_windows_jdk.sh index d7f3700c..307ad0e4 100755 --- a/scripts/download_windows_jdk.sh +++ b/scripts/download_windows_jdk.sh @@ -6,8 +6,8 @@ set -e # Download windows jdk mkdir -p jdks/windows cd jdks/windows -curl https://download.java.net/java/GA/jdk18.0.1.1/65ae32619e2f40f3a9af3af1851d6e19/2/GPL/openjdk-18.0.1.1_windows-x64_bin.zip > windows.zip +curl https://download.java.net/java/GA/jdk20.0.1/b4887098932d415489976708ad6d1a4b/9/GPL/openjdk-20.0.1_windows-x64_bin.zip > windows.zip unzip windows.zip rm windows.zip -mv jdk-18.0.1.1 jdk-18 +mv jdk-20.0.1.1 jdk-20 cd ../.. \ No newline at end of file diff --git a/scripts/link_linux.sh b/scripts/link_linux.sh index c029b093..b0afe5a8 100755 --- a/scripts/link_linux.sh +++ b/scripts/link_linux.sh @@ -4,7 +4,7 @@ set -e # Set env variables to build with mac toolchain but linux target -JAVA_HOME="./jdks/linux/jdk-18" +JAVA_HOME="./jdks/linux/jdk-20" # Build in dist/linux rm -rf dist/linux diff --git a/scripts/link_mac.sh b/scripts/link_mac.sh index ec502cce..6cbfb0a3 100755 --- a/scripts/link_mac.sh +++ b/scripts/link_mac.sh @@ -4,7 +4,7 @@ set -e # Set env variables to build with mac toolchain but linux target -JAVA_HOME="./jdks/mac/jdk-18" +JAVA_HOME="./jdks/mac/jdk-20" # Build using jlink rm -rf dist/mac diff --git a/scripts/link_windows.sh b/scripts/link_windows.sh index 94d82c1f..6935b513 100755 --- a/scripts/link_windows.sh +++ b/scripts/link_windows.sh @@ -4,7 +4,7 @@ set -e # Set env variables to build with mac toolchain but windows target -JAVA_HOME="./jdks/windows/jdk-18" +JAVA_HOME="./jdks/windows/jdk-20" # Build in dist/windows rm -rf dist/windows