From e95c7f1c71e0e6ef22d1862d866886359754ecc4 Mon Sep 17 00:00:00 2001 From: Arthur Poiret Date: Fri, 26 Jan 2024 17:33:34 +0100 Subject: [PATCH] build: update to openjdk 21 --- .github/workflows/dev.yml | 4 +-- .github/workflows/main.yml | 32 +++++++++---------- .../com/owlplug/core/tasks/AbstractTask.java | 3 +- owlplug-controls/pom.xml | 5 --- owlplug-host/pom.xml | 2 ++ pom.xml | 8 ++--- 6 files changed, 26 insertions(+), 28 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 38b3fd57..4685f162 100644 --- 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 index bb50b230..b3ebd6ab 100644 --- 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 index b3431585..00f3de68 100644 --- 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 index 6c3b5d14..5c18d4a8 100644 --- a/owlplug-controls/pom.xml +++ b/owlplug-controls/pom.xml @@ -11,11 +11,6 @@ owlplug-controls - - 17 - 17 - - org.openjfx diff --git a/owlplug-host/pom.xml b/owlplug-host/pom.xml index 8be22bf0..b5961d16 100644 --- a/owlplug-host/pom.xml +++ b/owlplug-host/pom.xml @@ -12,9 +12,11 @@ owlplug-host owlplug-host http://maven.apache.org + UTF-8 + junit diff --git a/pom.xml b/pom.xml index 3e509679..6be2f152 100644 --- a/pom.xml +++ b/pom.xml @@ -14,10 +14,10 @@ UTF-8 - 17 - 19.0.2.1 - 17 - 17 + 21 + 21.0.2 + 21 + 21