Upgrade dependencies (#260)

Co-authored-by: kaklakariada <kaklakariada@users.noreply.github.com>

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
         os: ['ubuntu-latest', 'windows-latest']
         include:
           - os: ubuntu-latest
-            java: 18
+            java: 20
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.java }}
       cancel-in-progress: true

.gitignore

@@ -6,7 +6,6 @@
 **/build/
 /time.properties
 /.idea
-/plugins/pmsmart/src/test/java/org/itsallcode/whiterabbit/plugin/pmsmart/Tester.java
 /build-fast.bat
 /build-fast-and-run.bat
 /launch.bat

.vscode/launch.json

@@ -6,7 +6,7 @@
     "configurations": [
         {
             "type": "java",
-            "name": "Launch App",
+            "name": "Launch WhiteRabbit",
             "request": "launch",
             "mainClass": "org.itsallcode.whiterabbit.jfxui.App",
             "projectName": "jfxui"

.vscode/settings.json

@@ -19,5 +19,6 @@
     "sonarlint.connectedMode.project": {
         "connectionId": "itsallcode",
         "projectKey": "white-rabbit"
-    }
+    },
+    "java.compile.nullAnalysis.mode": "automatic"
 }

CHANGELOG.md

@@ -28,6 +28,9 @@ See [Release](https://github.com/itsallcode/white-rabbit/releases/tag/v1.9.0) /
 * [#250](https://github.com/itsallcode/white-rabbit/issues/250): Fix missing autocomplete proposals.
   * Added build with Java 18.
 * [#254](https://github.com/itsallcode/white-rabbit/issues/254): Show Java version in About dialog.
+* [#260](https://github.com/itsallcode/white-rabbit/pull/260): Upgraded dependencies.
+  * Added build with Java 20
+  * UI-Tests run only in non-headless mode due to restrictions with the latest JavaFX version, see #261
 
 ## [1.8.0] - 2022-01-22
 

README.md

@@ -37,4 +37,3 @@ A time recording tool
   * Interruptions detected when computer sleeps for more than 2 minutes
 * Generates reports for your vacation and monthly working time
 * Detects when a second instance is started to avoid data corruption
-* Export project working times to pm-smart. See [the user guide](docs/user_guide.md#pmsmart) for details.

build.gradle

@@ -1,12 +1,12 @@
 plugins {
     id 'eclipse'
-    id "org.sonarqube" version "3.4.0.2513"
-    id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.6"
+    id "org.sonarqube" version "4.3.1.3277"
+    id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7"
     id "io.codearte.nexus-staging" version "0.30.0"
-    id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
+    id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
     id "com.moowork.node" version "1.3.1" apply false
-    id "com.github.ben-manes.versions" version "0.42.0"
-    id "org.panteleyev.jpackageplugin" version "1.4.1" apply false
+    id "com.github.ben-manes.versions" version "0.48.0"
+    id "org.panteleyev.jpackageplugin" version "1.5.2" apply false
     id "org.gradle.crypto.checksum" version "1.4.0" apply false
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

jfxui/src/main/java/org/itsallcode/whiterabbit/jfxui/JavaFxApp.java

@@ -159,7 +159,7 @@ public void loadMonth(final YearMonth month)
     private void ensureMonthAvailable(final YearMonth month)
     {
         JavaFxUtil.runOnFxApplicationThread(() -> {
-            if (!state.availableMonths.isEmpty() && !state.availableMonths.contains(month))
+            if (state != null && !state.availableMonths.isEmpty() && !state.availableMonths.contains(month))
             {
                 LOG.trace("Adding month {} to combo box", month);
                 state.availableMonths.add(month);

logic/build.gradle

@@ -22,7 +22,7 @@ sourceSets {
 task createAppProperties(type: WriteProperties) {
     def buildDate = Instant.now().toString()
     comment = "White Rabbit app properties"
-    outputFile = "$generatedResourcesFolder/white-rabbit.properties"
+    destinationFile = file("$generatedResourcesFolder/white-rabbit.properties")
     property 'version', project.version
     property 'buildDate', buildDate
 }

settings.gradle

@@ -1,3 +1,7 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.4.0'
+}
+
 rootProject.name = 'white-rabbit'
 
 include 'logic'
@@ -15,15 +19,15 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         libs {
-            version('junitJupiter', '5.9.1')
-            version('mockito', '4.8.0')
-            version('log4j', '2.19.0')
-            version('javafx', '20-ea+4')
+            version('junitJupiter', '5.10.0')
+            version('mockito', '5.5.0')
+            version('log4j', '2.20.0')
+            version('javafx', '20-ea+9') // Versions >= 20-ea+11 and 20 causes UI-Test failures in non-headless mode (-PuiTestsHeadless=false)
 
             library('junitParams', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junitJupiter')
-            library('assertj', 'org.assertj:assertj-core:3.23.1')
-            library('junitPioneer', 'org.junit-pioneer:junit-pioneer:1.7.1')
-            library('equalsverifier', 'nl.jqno.equalsverifier:equalsverifier:3.10.1')
+            library('assertj', 'org.assertj:assertj-core:3.24.2')
+            library('junitPioneer', 'org.junit-pioneer:junit-pioneer:2.1.0')
+            library('equalsverifier', 'nl.jqno.equalsverifier:equalsverifier:3.15.1')
             library('hamcrest', 'org.hamcrest:hamcrest-all:1.3')
             library('mockito', 'org.mockito', 'mockito-core').versionRef('mockito')
             library('mocktioJunit', 'org.mockito', 'mockito-junit-jupiter').versionRef('mockito')
@@ -33,7 +37,7 @@ dependencyResolutionManagement {
             library('monocle', 'org.testfx:openjfx-monocle:jdk-12.0.1+2')
 
             library('jsonBindApi', 'jakarta.json.bind:jakarta.json.bind-api:3.0.0')
-            library('yasson', 'org.eclipse:yasson:3.0.2')
+            library('yasson', 'org.eclipse:yasson:3.0.3')
 
             library('jdtAnnotations', 'org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.700')
             library('jansi', 'org.fusesource.jansi:jansi:2.4.0')