From 44ebf10b31d79543a4609fa4d69f30a0aacb2085 Mon Sep 17 00:00:00 2001 From: Tue Ton <49886739+chirontt@users.noreply.github.com> Date: Sun, 18 Jun 2023 17:41:24 -0400 Subject: [PATCH] update to use GraalVM for JDK 17 Community 17.0.7 --- .github/workflows/gradle-build.yml | 23 +++++++++---- .github/workflows/maven-build.yml | 32 ++++++++----------- .../.mvn/wrapper/maven-wrapper.properties | 2 +- trunk/SwingSet3/build.gradle | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- trunk/SwingSet3/pom.xml | 16 +++++----- 6 files changed, 41 insertions(+), 38 deletions(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 69cc18e..9bc0ade 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -13,7 +13,8 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] java-version: [11, 17] - graalvm-version: ['22.3.1'] + graalvm-version: ['22.3.2'] + graalvm-distribution: ['graalvm-community'] fail-fast: false steps: @@ -30,13 +31,13 @@ jobs: key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} restore-keys: ${{ runner.os }}-gradle- - - name: Download Liberica NIK ${{ matrix.graalvm-version }} for Java ${{ matrix.java-version }} (Linux) + - name: Download Liberica NIK ${{ matrix.graalvm-distribution }} 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" + download_url="https://download.bell-sw.com/vm/23.0.0/bellsoft-liberica-vm-core-openjdk17.0.7+7-23.0.0+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) + - name: Set up Liberica NIK ${{ matrix.graalvm-distribution }} for Java ${{ matrix.java-version }} (Linux) if: runner.os == 'Linux' && matrix.java-version == 17 uses: actions/setup-java@v3 with: @@ -45,12 +46,20 @@ jobs: 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 + - name: Set up GraalVM ${{ matrix.graalvm-distribution }} for Java ${{ matrix.java-version }} + if: runner.os != 'Linux' && matrix.java-version == 17 uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.graalvm-version }} java-version: ${{ matrix.java-version }} + distribution: ${{ matrix.graalvm-distribution }} + components: 'native-image' + + - name: Set up GraalVM ${{ matrix.graalvm-version }} for Java 11 + if: matrix.java-version == 11 + uses: graalvm/setup-graalvm@v1 + with: + java-version: ${{ matrix.java-version }} + version: ${{ matrix.graalvm-version }} components: 'native-image' - name: Report Java version diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml index 31823a6..8d6f93a 100644 --- a/.github/workflows/maven-build.yml +++ b/.github/workflows/maven-build.yml @@ -13,20 +13,21 @@ jobs: matrix: os: [ubuntu-latest, windows-latest] java-version: [11, 17] - graalvm-version: ['22.3.1'] + graalvm-version: ['22.3.2'] + graalvm-distribution: ['graalvm-community'] fail-fast: false steps: - name: Git checkout uses: actions/checkout@v3 - - name: Download Liberica NIK ${{ matrix.graalvm-version }} for Java ${{ matrix.java-version }} (Linux) + - name: Download Liberica NIK ${{ matrix.graalvm-distribution }} 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/23.0.0/bellsoft-liberica-vm-core-openjdk17.0.7+7-23.0.0+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) + - name: Set up Liberica NIK ${{ matrix.graalvm-distribution }} for Java ${{ matrix.java-version }} (Linux) if: runner.os == 'Linux' && matrix.java-version == 17 uses: actions/setup-java@v3 with: @@ -35,27 +36,20 @@ 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 + - name: Set up GraalVM ${{ matrix.graalvm-distribution }} for Java ${{ matrix.java-version }} + if: runner.os != 'Linux' && matrix.java-version == 17 + uses: graalvm/setup-graalvm@v1 with: - distribution: jdkfile java-version: ${{ matrix.java-version }} - jdkFile: ${{ runner.temp }}/java_package.tar.gz - architecture: x64 + distribution: ${{ matrix.graalvm-distribution }} + components: 'native-image' - - name: Set up GraalVM ${{ matrix.graalvm-version }} for Java ${{ matrix.java-version }} - if: runner.os != 'Linux' || matrix.java-version != 17 + - name: Set up GraalVM ${{ matrix.graalvm-version }} for Java 11 + if: matrix.java-version == 11 uses: graalvm/setup-graalvm@v1 with: - version: ${{ matrix.graalvm-version }} java-version: ${{ matrix.java-version }} + version: ${{ matrix.graalvm-version }} components: 'native-image' - name: Report Java version diff --git a/trunk/SwingSet3/.mvn/wrapper/maven-wrapper.properties b/trunk/SwingSet3/.mvn/wrapper/maven-wrapper.properties index 57bb584..0d2696f 100644 --- a/trunk/SwingSet3/.mvn/wrapper/maven-wrapper.properties +++ b/trunk/SwingSet3/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/trunk/SwingSet3/build.gradle b/trunk/SwingSet3/build.gradle index f6e39f8..de749ef 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.20' + id 'org.graalvm.buildtools.native' version '0.9.23' } tasks.wrapper { - gradleVersion = '8.0.2' + gradleVersion = '8.1.1' distributionType = Wrapper.DistributionType.ALL } diff --git a/trunk/SwingSet3/gradle/wrapper/gradle-wrapper.properties b/trunk/SwingSet3/gradle/wrapper/gradle-wrapper.properties index 761b8f0..8707e8b 100644 --- a/trunk/SwingSet3/gradle/wrapper/gradle-wrapper.properties +++ b/trunk/SwingSet3/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/trunk/SwingSet3/pom.xml b/trunk/SwingSet3/pom.xml index cfd2e49..31a8921 100644 --- a/trunk/SwingSet3/pom.xml +++ b/trunk/SwingSet3/pom.xml @@ -13,7 +13,7 @@ 11 UTF-8 - 0.9.20 + 0.9.23 com.github.chirontt.graalvm.swingset3.NativeSwingSet3 com/sun/swingset3/resources/images/splash.png @@ -290,7 +290,7 @@ org.apache.maven.plugins maven-antrun-plugin - 3.0.0 + 3.1.0 remove-unneeded-dll-files