From 3f662032da2d07d0784ac9a1356b565e9243072b Mon Sep 17 00:00:00 2001
From: Gerrit Grunwald <han.solo@mac.com>
Date: Tue, 28 Nov 2023 10:04:08 +0100
Subject: [PATCH] Switched to JDK 21

---
 .github/workflows/ci.yaml                | 12 ++++++------
 build.gradle                             |  8 ++++----
 build_app_linux.sh                       |  6 +++---
 build_app_macos.sh                       |  6 +++---
 build_app_windows.bat                    |  6 +++---
 gradle.properties                        |  8 ++++----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 7 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d7f8bf6..379d398 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -7,10 +7,10 @@ jobs:
     runs-on: [ windows-latest ]
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17.0.7
+      - name: Set up JDK 21.0.1
         uses: actions/setup-java@v3
         with:
-          java-version: 17.0.7
+          java-version: 21.0.1
           distribution: 'zulu'
           gpg-private-key: ${{ secrets.GPG_KEY }}
           gpg-passphrase: PASSPHRASE
@@ -32,10 +32,10 @@ jobs:
     runs-on: [ macos-latest ]
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17.0.7
+      - name: Set up JDK 21.0.1
         uses: actions/setup-java@v3
         with:
-          java-version: 17.0.7
+          java-version: 21.0.1
           distribution: 'zulu'
           gpg-private-key: ${{ secrets.GPG_KEY }}
           gpg-passphrase: PASSPHRASE
@@ -59,10 +59,10 @@ jobs:
     runs-on: [ ubuntu-latest ]
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 17.0.7
+      - name: Set up JDK 21.0.1
         uses: actions/setup-java@v3
         with:
-          java-version: 17.0.7
+          java-version: 21.0.1
           distribution: 'zulu'
           gpg-private-key: ${{ secrets.GPG_KEY }}
           gpg-passphrase: PASSPHRASE
diff --git a/build.gradle b/build.gradle
index f42c872..8568960 100644
--- a/build.gradle
+++ b/build.gradle
@@ -57,10 +57,10 @@ dependencies {
     implementation "org.openjfx:javafx-controls:${javafxVersion}:${platform}"
     implementation "org.openjfx:javafx-media:${javafxVersion}:${platform}"
     implementation "org.openjfx:javafx-swing:${javafxVersion}:${platform}"
-    implementation 'eu.hansolo:jdktools:17.0.33'
-    implementation 'eu.hansolo:toolbox:17.0.57'
-    implementation 'eu.hansolo:toolboxfx:17.0.47'
-    implementation 'eu.hansolo:applefx:17.0.53'
+    implementation 'eu.hansolo:jdktools:21.0.0'
+    implementation 'eu.hansolo:toolbox:21.0.0'
+    implementation 'eu.hansolo:toolboxfx:21.0.0'
+    implementation 'eu.hansolo:applefx:21.0.0'
     implementation 'com.google.code.gson:gson:2.10.1'
     //implementation 'com.dustinredmond.fxtrayicon:FXTrayIcon:4.0.1'
     implementation 'com.dustinredmond.fxtrayicon:FXTrayIcon:3.1.2'
diff --git a/build_app_linux.sh b/build_app_linux.sh
index 8e233cb..482447e 100755
--- a/build_app_linux.sh
+++ b/build_app_linux.sh
@@ -18,9 +18,9 @@
 # limitations under the License.
 #
 
-JAVA_VERSION=17
-MAIN_JAR="GlucoStatusFX-17.0.61.jar"
-APP_VERSION=17.0.61
+JAVA_VERSION=21
+MAIN_JAR="GlucoStatusFX-21.0.0.jar"
+APP_VERSION=21.0.0
 
 echo "java home: $JAVA_HOME"
 echo "project version: $PROJECT_VERSION"
diff --git a/build_app_macos.sh b/build_app_macos.sh
index e77698c..d078f27 100755
--- a/build_app_macos.sh
+++ b/build_app_macos.sh
@@ -18,9 +18,9 @@
 # limitations under the License.
 #
 
-JAVA_VERSION=17
-MAIN_JAR="GlucoStatusFX-17.0.61.jar"
-APP_VERSION=17.0.61
+JAVA_VERSION=21
+MAIN_JAR="GlucoStatusFX-21.0.0.jar"
+APP_VERSION=21.0.0
 
 echo "java home: $JAVA_HOME"
 echo "project version: $PROJECT_VERSION"
diff --git a/build_app_windows.bat b/build_app_windows.bat
index 3ef03a8..422eac7 100644
--- a/build_app_windows.bat
+++ b/build_app_windows.bat
@@ -1,8 +1,8 @@
 @ECHO OFF
 
-set JAVA_VERSION=17
-set MAIN_JAR=GlucoStatusFX-17.0.61.jar
-set APP_VERSION=17.0.61
+set JAVA_VERSION=21
+set MAIN_JAR=GlucoStatusFX-21.0.0.jar
+set APP_VERSION=21.0.0
 
 rem ------ SETUP DIRECTORIES AND FILES ----------------------------------------
 rem Remove previously generated java runtime and installers. Copy all required
diff --git a/gradle.properties b/gradle.properties
index 8e06840..7b24772 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-sourceCompatibility = 17
-targetCompatibility = 17
+sourceCompatibility = 21
+targetCompatibility = 21
 
 group               = eu.hansolo
-version             = 17.0.61
-javafxVersion       = 20.0.2
+version             = 21.0.0
+javafxVersion       = 21.0.1
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e70a7f7..fdaffae 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -18,6 +18,6 @@
 
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists