Merge pull request #229 from DropSnorz/openjdk/21

OpenJdk 21
DropSnorz · Jan 27, 2024 · 83eec79 · 83eec79
2 parents b579883 + e95c7f1
commit 83eec79
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 28 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: 17
+        java-version: 21
         cache: 'maven'
     - name: Build maven parent project
       run: mvn -B install -DskipTests

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -21,11 +21,11 @@ jobs:
         fetch-depth: 0
         submodules: recursive
         token: ${{ secrets.REPO_ACCESS_TOKEN }}
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: 17
+        java-version: 21
     - name: "Download Projucer"
       run: ./build/download-projucer.sh
       shell: bash
@@ -50,11 +50,11 @@ jobs:
         fetch-depth: 0
         submodules: recursive
         token: ${{ secrets.REPO_ACCESS_TOKEN }}
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: 17
+        java-version: 21
     - name: "Download Projucer"
       run: ./build/download-projucer.sh
       shell: bash
@@ -81,11 +81,11 @@ jobs:
         fetch-depth: 0
         submodules: recursive
         token: ${{ secrets.REPO_ACCESS_TOKEN }}
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: 17
+        java-version: 21
     - name: "Download Projucer"
       run: ./build/download-projucer.sh
       shell: bash
@@ -113,11 +113,11 @@ jobs:
     needs: [build-host-win, build-host-osx, build-host-linux]
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: 17
+        java-version: 21
     - name: Get version
       run: echo "version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
       id: get-version
@@ -159,11 +159,11 @@ jobs:
     needs: [build-jar]
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: 17
+        java-version: 21
     - name: Get version
       run: echo "version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
       shell: bash
@@ -185,11 +185,11 @@ jobs:
     needs: [build-jar]
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: 17
+        java-version: 21
     - name: Get version
       run: echo "version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
       id: get-version
@@ -210,11 +210,11 @@ jobs:
     needs: [build-jar]
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: 17
+        java-version: 21
     - name: Get version
       run: echo "version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
       id: get-version
@@ -235,11 +235,11 @@ jobs:
     needs: [build-jar]
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
-        java-version: 17
+        java-version: 21
     - name: Get version
       run: echo "version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
       id: get-version

diff --git a/owlplug-client/src/main/java/com/owlplug/core/tasks/AbstractTask.java b/owlplug-client/src/main/java/com/owlplug/core/tasks/AbstractTask.java
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import javafx.concurrent.Task;
+import javafx.concurrent.Worker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -99,7 +100,7 @@ public String toString() {
     if (this.isDone()) {
       prefix = "D";
     }
-    if (this.getState().equals(State.FAILED)) {
+    if (this.getState().equals(Worker.State.FAILED)) {
       prefix = "F";
     }
     return prefix + " - " + this.getName();

diff --git a/owlplug-controls/pom.xml b/owlplug-controls/pom.xml
@@ -11,11 +11,6 @@
 
     <artifactId>owlplug-controls</artifactId>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.openjfx</groupId>

diff --git a/owlplug-host/pom.xml b/owlplug-host/pom.xml
@@ -12,9 +12,11 @@
 	<artifactId>owlplug-host</artifactId>
 	<name>owlplug-host</name>
 	<url>http://maven.apache.org</url>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>

diff --git a/pom.xml b/pom.xml
@@ -14,10 +14,10 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>17</java.version>
-		<javafx.version>19.0.2.1</javafx.version>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<java.version>21</java.version>
+		<javafx.version>21.0.2</javafx.version>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 	</properties>
 
     <modules>