Upgrade dependencies

.github/workflows/build.yml

@@ -10,10 +10,10 @@ jobs:
   matrix-build:
     strategy:
       matrix:
-        java: [21]
-        os: ['ubuntu-latest', 'windows-latest'] # 'macos-latest' not supported at the moment
+        java: [25]
+        os: ['ubuntu-latest', 'windows-latest'] # 'macos-latest' has issues with UI tests
     env:
-      DEFAULT_JAVA: 21
+      DEFAULT_JAVA: 25
       DEFAULT_OS: 'ubuntu-latest'
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.java }}
@@ -41,7 +41,7 @@ jobs:
       uses: gradle/actions/setup-gradle@v5
 
     - name: Cache SonarQube packages
-      uses: actions/cache@v4
+      uses: actions/cache@v5
       if: ${{ env.DEFAULT_JAVA == matrix.java && env.DEFAULT_OS == matrix.os }}
       with:
         path: ~/.sonar/cache
@@ -53,7 +53,7 @@ jobs:
         ./gradlew build --info --warning-mode=summary -PskipFlakyTests=true -PjavaVersion=${{ matrix.java }}
 
     - name: Archive executable JAR
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       if: ${{ env.DEFAULT_JAVA == matrix.java && env.DEFAULT_OS == matrix.os }}
       with:
         name: executable-jar
@@ -64,7 +64,7 @@ jobs:
         if-no-files-found: error
 
     - name: Archive test reports for ${{ matrix.os }} using Java ${{ matrix.java }}
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       if: ${{ always() }}
       with:
         name: test-reports-${{ matrix.os }}-java-${{ matrix.java }}
@@ -86,7 +86,7 @@ jobs:
         ./gradlew jpackage --info --warning-mode=summary -PjavaVersion=${{ matrix.java }}
 
     - name: Archive native package for ${{ runner.os }}
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v7
       if: ${{ env.DEFAULT_JAVA == matrix.java }}
       with:
         name: packages-${{ runner.os }}

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
     - uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
-        java-version: 21
+        java-version: 25
 
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v5

.github/workflows/dependency-submission.yml

@@ -18,6 +18,6 @@ jobs:
       uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
-        java-version: 21
+        java-version: 25
     - name: Generate and submit dependency graph
       uses: gradle/actions/dependency-submission@v5

.github/workflows/release.yml

@@ -37,15 +37,15 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
       - name: Build
         run: ./gradlew build jpackage --info --warning-mode all -PskipFlakyTests=true
 
       - name: Archive executable JAR
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         if: ${{ env.DEFAULT_OS == matrix.os }}
         with:
           name: executable-jar
@@ -56,7 +56,7 @@ jobs:
             product/build/libs-checksums/*
 
       - name: Archive native package for ${{ runner.os }}
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: native-package-${{ runner.os }}
           retention-days: 5
@@ -83,7 +83,7 @@ jobs:
         uses: actions/setup-java@v5
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v5
@@ -105,7 +105,7 @@ jobs:
             ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
 
       - name: Download artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           path: build/release-artifacts
 

.vscode/tasks.json

@@ -6,7 +6,7 @@
         {
             "label": "Build",
             "type": "shell",
-            "command": "JAVA_HOME=$JAVA11_HOME ./gradlew.bat build",
+            "command": "JAVA_HOME=$JAVA25_HOME ./gradlew build",
             "group": {
                 "kind": "build",
                 "isDefault": true

CHANGELOG.md

@@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 See [Release](https://github.com/itsallcode/white-rabbit/releases/tag/v1.10.0) / [Milestone](https://github.com/itsallcode/white-rabbit/milestone/12?closed=1)
 
+This release requires Java 25.
+
 ## [1.9.0] - 2024-09-08
 
 See [Release](https://github.com/itsallcode/white-rabbit/releases/tag/v1.9.0) / [Milestone](https://github.com/itsallcode/white-rabbit/milestone/11?closed=1)

api/.settings/org.eclipse.jdt.core.prefs

@@ -42,9 +42,9 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.lambda.genericSignature=do not generate
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.shareCommonFinallyBlocks=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=21
+org.eclipse.jdt.core.compiler.compliance=25
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -169,7 +169,7 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=21
+org.eclipse.jdt.core.compiler.source=25
 org.eclipse.jdt.core.compiler.storeAnnotations=disabled
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

build.gradle

@@ -1,20 +1,20 @@
 plugins {
     id 'eclipse'
-    id "org.sonarqube" version "5.1.0.4882"
-    id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.8"
+    id "org.sonarqube" version "7.2.3.7755"
+    id "org.jetbrains.gradle.plugin.idea-ext" version "1.4.1"
     id "io.codearte.nexus-staging" version "0.30.0"
-    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
+    id 'com.gradleup.shadow' version '9.4.1' apply false
     id "com.moowork.node" version "1.3.1" apply false
-    id "com.github.ben-manes.versions" version "0.51.0"
-    id "org.panteleyev.jpackageplugin" version "1.6.0" apply false
+    id "com.github.ben-manes.versions" version "0.53.0"
+    id "org.panteleyev.jpackageplugin" version "2.0.1" apply false
     id "org.gradle.crypto.checksum" version "1.4.0" apply false
     id "io.github.gradle-nexus.publish-plugin" version "2.0.0"
 }
 
 version = "1.9.0"
 group = "org.itsallcode.whiterabbit"
 
-def javaVersion = project.hasProperty('javaVersion') ? project.getProperty('javaVersion') : 21
+def javaVersion = project.hasProperty('javaVersion') ? project.getProperty('javaVersion') : 25
 
 subprojects {
     group = rootProject.group

docs/developer_guide.md

@@ -59,7 +59,7 @@ Run a single test:
 ### Check that dependencies are up-to-date
 
 ```sh
-./gradlew dependencyUpdates
+./gradlew dependencyUpdates --no-parallel
 ```
 
 ### <a name="build_native_package"></a>Build Native Packages

docs/user_guide.md

@@ -3,7 +3,7 @@
 
 ## Install WhiteRabbit as Executable JAR
 
-Precondition: Install Java Runtime Environment (JRE) 21, e.g. from [Adoptium / Eclipse Temurin](https://adoptium.net/).
+Precondition: Install Java Runtime Environment (JRE) 25, e.g. from [Adoptium / Eclipse Temurin](https://adoptium.net/).
 
 1. Download the `.jar` file from the latest [release](https://github.com/itsallcode/white-rabbit/releases)
 2. Launch it by
@@ -74,7 +74,7 @@ Restart WhiteRabbit after changing the configuration file.
 
 #### Duration format
 
-Enter duration values in the format used by [Duration.parse()](https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/time/Duration.html#parse(java.lang.CharSequence)). Examples:
+Enter duration values in the format used by [Duration.parse()](https://docs.oracle.com/en/java/javase/25/docs/api/java.base/java/time/Duration.html#parse(java.lang.CharSequence)). Examples:
 
 * `PT5H`: 5 hours
 * `PT5H30M`: 5 hours and 30 minutes

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

jfxui/.settings/org.eclipse.jdt.core.prefs

@@ -42,9 +42,9 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.lambda.genericSignature=do not generate
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.shareCommonFinallyBlocks=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=21
+org.eclipse.jdt.core.compiler.compliance=25
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -169,7 +169,7 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=21
+org.eclipse.jdt.core.compiler.source=25
 org.eclipse.jdt.core.compiler.storeAnnotations=disabled
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL

jfxui/build.gradle

@@ -1,7 +1,30 @@
+def getCurrentJavaFxPlatform = {
+    def os = org.gradle.internal.os.OperatingSystem.current()
+    if(os.isWindows()) {
+        return 'win'
+    }
+    if(os.isLinux()) {
+        return 'linux'
+    }
+    if(os.isMacOsX()) {
+        def architecture = System.getProperty('os.arch').toLowerCase(java.util.Locale.ROOT)
+        return architecture.contains('aarch64') || architecture.contains('arm64') ? 'mac-aarch64' : 'mac'
+    }
+    throw new GradleException("Unsupported operating system for JavaFX: ${os}")
+}
+
+def filterCurrentJavaFxRuntimeClasspath = { classpath ->
+    def currentPlatform = getCurrentJavaFxPlatform()
+    classpath.filter { file ->
+        (!(file.name ==~ /javafx-(base|graphics|controls)-.+-(win|linux|mac|mac-aarch64)\.jar/)
+                || file.name.endsWith("-${currentPlatform}.jar"))
+    }
+}
+
 dependencies {
     implementation project(':logic')
     def javaFxVersion = libs.versions.javafx.get()
-    ['win', 'mac', 'linux'].forEach {platform ->
+    ['win', 'mac', 'mac-aarch64', 'linux'].forEach {platform ->
         implementation "org.openjfx:javafx-base:$javaFxVersion:$platform"
         implementation "org.openjfx:javafx-graphics:$javaFxVersion:$platform"
         implementation "org.openjfx:javafx-controls:$javaFxVersion:$platform"
@@ -43,7 +66,7 @@ task uiTest(type: Test, group: 'verification') {
         }
     }
 
-    forkEvery 5
+    forkEvery = 5
     jvmArgs '-XX:+HeapDumpOnOutOfMemoryError', '-XX:+EnableDynamicAgentLoading'
 
     if(!project.hasProperty("uiTestsHeadless") || project.property("uiTestsHeadless") != "false") {
@@ -58,7 +81,7 @@ task uiTest(type: Test, group: 'verification') {
     systemProperty 'testfx.setup.timeout', '30000'
 
     testClassesDirs = sourceSets.uiTest.output.classesDirs
-    classpath = sourceSets.uiTest.runtimeClasspath
+    classpath = filterCurrentJavaFxRuntimeClasspath(sourceSets.uiTest.runtimeClasspath)
     shouldRunAfter test
 }
 
@@ -73,5 +96,5 @@ ext {
 task run(type: JavaExec, group: 'run') {
     mainClass = project.mainClass
     workingDir = rootProject.projectDir
-    classpath = sourceSets.main.runtimeClasspath
+    classpath = filterCurrentJavaFxRuntimeClasspath(sourceSets.main.runtimeClasspath)
 }

logic/.settings/org.eclipse.jdt.core.prefs

@@ -42,9 +42,9 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.lambda.genericSignature=do not generate
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
 org.eclipse.jdt.core.compiler.codegen.shareCommonFinallyBlocks=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=21
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=25
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=21
+org.eclipse.jdt.core.compiler.compliance=25
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -169,7 +169,7 @@ org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.processAnnotations=disabled
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=21
+org.eclipse.jdt.core.compiler.source=25
 org.eclipse.jdt.core.compiler.storeAnnotations=disabled
 org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
 org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL