Skip to content

Commit

Permalink
Switched to JDK 21
Browse files Browse the repository at this point in the history
  • Loading branch information
HanSolo committed Nov 28, 2023
1 parent 4702bc6 commit 3f66203
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 24 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions build_app_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions build_app_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions build_app_windows.bat
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 3f66203

Please sign in to comment.