diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 67cf4cc..69cc18e 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -13,7 +13,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] java-version: [11, 17] - graalvm-version: ['22.3.0'] + graalvm-version: ['22.3.1'] fail-fast: false steps: @@ -33,7 +33,7 @@ jobs: - name: Download Liberica NIK ${{ matrix.graalvm-version }} for Java ${{ matrix.java-version }} (Linux) if: runner.os == 'Linux' && matrix.java-version == 17 run: | - download_url="https://download.bell-sw.com/vm/22.3.0/bellsoft-liberica-vm-core-openjdk17.0.5+8-22.3.0+2-linux-amd64.tar.gz" + download_url="https://download.bell-sw.com/vm/22.3.1/bellsoft-liberica-vm-core-openjdk17.0.6+10-22.3.1+1-linux-amd64.tar.gz" wget -O $RUNNER_TEMP/java_package.tar.gz $download_url - name: Set up Liberica NIK ${{ matrix.graalvm-version }} for Java ${{ matrix.java-version }} (Linux) diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 5014950..31823a6 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -13,7 +13,7 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] java-version: [11, 17] - graalvm-version: ['22.3.0'] + graalvm-version: ['22.3.1'] fail-fast: false steps: @@ -35,6 +35,21 @@ jobs: jdkFile: ${{ runner.temp }}/java_package.tar.gz architecture: x64 + - name: Download Liberica NIK ${{ matrix.graalvm-version }} for Java ${{ matrix.java-version }} (Linux) + if: runner.os == 'Linux' && matrix.java-version == 17 + run: | + download_url="https://download.bell-sw.com/vm/22.3.1/bellsoft-liberica-vm-core-openjdk17.0.6+10-22.3.1+1-linux-amd64.tar.gz" + wget -O $RUNNER_TEMP/java_package.tar.gz $download_url + + - name: Set up Liberica NIK ${{ matrix.graalvm-version }} for Java ${{ matrix.java-version }} (Linux) + if: runner.os == 'Linux' && matrix.java-version == 17 + uses: actions/setup-java@v3 + with: + distribution: jdkfile + java-version: ${{ matrix.java-version }} + jdkFile: ${{ runner.temp }}/java_package.tar.gz + architecture: x64 + - name: Set up GraalVM ${{ matrix.graalvm-version }} for Java ${{ matrix.java-version }} if: runner.os != 'Linux' || matrix.java-version != 17 uses: graalvm/setup-graalvm@v1 diff --git a/trunk/SwingSet3/build.gradle b/trunk/SwingSet3/build.gradle index b61fbf5..f6e39f8 100644 --- a/trunk/SwingSet3/build.gradle +++ b/trunk/SwingSet3/build.gradle @@ -1,10 +1,10 @@ plugins { id 'application' - id 'org.graalvm.buildtools.native' version '0.9.17' + id 'org.graalvm.buildtools.native' version '0.9.20' } tasks.wrapper { - gradleVersion = '7.5.1' + gradleVersion = '8.0.2' distributionType = Wrapper.DistributionType.ALL } diff --git a/trunk/SwingSet3/gradle/wrapper/gradle-wrapper.jar b/trunk/SwingSet3/gradle/wrapper/gradle-wrapper.jar index 249e583..ccebba7 100644 Binary files a/trunk/SwingSet3/gradle/wrapper/gradle-wrapper.jar and b/trunk/SwingSet3/gradle/wrapper/gradle-wrapper.jar differ diff --git a/trunk/SwingSet3/gradle/wrapper/gradle-wrapper.properties b/trunk/SwingSet3/gradle/wrapper/gradle-wrapper.properties index 8fad3f5..761b8f0 100644 --- a/trunk/SwingSet3/gradle/wrapper/gradle-wrapper.properties +++ b/trunk/SwingSet3/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/trunk/SwingSet3/gradlew b/trunk/SwingSet3/gradlew index a69d9cb..79a61d4 100755 --- a/trunk/SwingSet3/gradlew +++ b/trunk/SwingSet3/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/trunk/SwingSet3/gradlew.bat b/trunk/SwingSet3/gradlew.bat index f127cfd..93e3f59 100644 --- a/trunk/SwingSet3/gradlew.bat +++ b/trunk/SwingSet3/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/trunk/SwingSet3/pom.xml b/trunk/SwingSet3/pom.xml index decfb6d..cfd2e49 100644 --- a/trunk/SwingSet3/pom.xml +++ b/trunk/SwingSet3/pom.xml @@ -13,7 +13,7 @@ 11 UTF-8 - 0.9.17 + 0.9.20 com.github.chirontt.graalvm.swingset3.NativeSwingSet3 com/sun/swingset3/resources/images/splash.png