Use JVM 17 + JavaFX 20 (#5)

xjmusic · Aug 17, 2023 · 9e8030d · 9e8030d
1 parent c0d103a
commit 9e8030d
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml
@@ -18,28 +18,28 @@ jobs:
       - uses: burrunan/gradle-cache-action@v1
         name: Cache Gradle
         with:
-          job-id: jdk18
+          job-id: jdk17
 
       - name: Install and cache system packages
         uses: awalsh128/cache-apt-pkgs-action@latest
         with:
           packages: ffmpeg gpac
           version: 1.0
 
-      - name: Setup JDK 18
+      - name: Setup JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 18
+          java-version: 17
           java-package: jdk
 
       - uses: actions/cache@v2
         with:
           path: |
             ~/.gradle/caches
             ~/.gradle/wrapper
-          key: ${{ runner.os }}-gradle8-java18-${{ hashFiles('**/*.gradle*') }}
+          key: ${{ runner.os }}-gradle8-java17-${{ hashFiles('**/*.gradle*') }}
           restore-keys: |
-            ${{ runner.os }}-gradle8-java18-
+            ${{ runner.os }}-gradle8-java17-
 
       - name: Build & Run Tests
         run: "./gradlew --info --no-daemon build test"

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -19,18 +19,18 @@ jobs:
       - uses: burrunan/gradle-cache-action@v1
         name: Cache Gradle
         with:
-          job-id: jdk18
+          job-id: jdk17
 
       - name: Install and cache system packages
         uses: awalsh128/cache-apt-pkgs-action@latest
         with:
           packages: ffmpeg gpac
           version: 1.0
 
-      - name: Setup JDK 18
+      - name: Setup JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 18
+          java-version: 17
           java-package: jdk
 
       - name: Build & Run Tests

diff --git a/.github/workflows/tag_dist.yml b/.github/workflows/tag_dist.yml
@@ -49,7 +49,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macOS-latest, windows-latest ]
-        java: [ '18' ]
+        java: [ '17' ]
       fail-fast: false
     steps:
 
@@ -87,7 +87,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, macOS-latest, windows-latest ]
-        java: [ '18' ]
+        java: [ '17' ]
       fail-fast: false
     steps:
 

diff --git a/.java-version b/.java-version
@@ -1 +1 @@
-18.0
+17.0
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ plugins {
 }
 
 ext {
-  javaFxVersion = '18.0.2'
+  javaFxVersion = '20.0.2'
   junitVersion = '5.9.2'
   logbackVersion = '1.4.11'
   springBootVersion = '3.1.2'
@@ -21,8 +21,8 @@ ext {
 
 group = 'io.xj'
 
-sourceCompatibility = JavaVersion.VERSION_18
-targetCompatibility = JavaVersion.VERSION_18
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 mainClassName = 'io.xj.gui.WorkstationGuiApplication'
 

diff --git a/src/main/resources/views/main-window.fxml b/src/main/resources/views/main-window.fxml
@@ -46,7 +46,7 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-<BorderPane xmlns="http://javafx.com/javafx/18.0.2" xmlns:fx="http://javafx.com/fxml/1"
+<BorderPane xmlns="http://javafx.com/javafx/20.0.2" xmlns:fx="http://javafx.com/fxml/1"
             fx:controller="io.xj.gui.controllers.MainWindowController">
   <top>
     <VBox prefHeight="386.0" prefWidth="640.0" BorderPane.alignment="CENTER">