update to use GraalVM for JDK 17 Community 17.0.7

chirontt · Jun 18, 2023 · 44ebf10 · 44ebf10
1 parent 2b79280
commit 44ebf10
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 38 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -13,7 +13,7 @@
     <properties>
         <maven.compiler.release>11</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <native.maven.plugin.version>0.9.20</native.maven.plugin.version>
+        <native.maven.plugin.version>0.9.23</native.maven.plugin.version>
         <main.class>com.github.chirontt.graalvm.swingset3.NativeSwingSet3</main.class>
         <splash.image>com/sun/swingset3/resources/images/splash.png</splash.image>
         <!-- system properties for the application when run by exec:exec command;
@@ -71,12 +71,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.0</version>
                 <configuration>
                     <archive>
                         <manifestEntries>
@@ -89,7 +89,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.5.0</version>
                 <configuration>
                     <quiet>true</quiet>
                     <doclint>none</doclint>
@@ -103,7 +103,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.5.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -215,7 +215,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>copy-font-config-files</id>
@@ -242,7 +242,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <!-- run the application in a separate standard JVM -->
                     <execution>
@@ -290,7 +290,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>remove-unneeded-dll-files</id>