Spring 3 + Mac

.github/workflows/mavenCi.yml

@@ -19,28 +19,28 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      version: 1.3.${{ github.run_number }}
+      version: 2.0.${{ github.run_number }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'corretto'
           cache: maven
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: 'java'
 
       - name: Build
         run:  mvn -V -B clean package org.jacoco:jacoco-maven-plugin:0.8.7:prepare-agent org.jacoco:jacoco-maven-plugin:0.8.7:report -Pcoverage -Dproject.version=${{ env.version }}-SNAPSHOT
 
       - name: Upload Build Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: KeepTime-${{ env.version }}
           path: /home/runner/work/KeepTime/KeepTime/target/*-bin.zip
@@ -49,27 +49,22 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -V -B sonar:sonar
-          -Dsonar.host.url=${{ secrets.HOST_URL }}
-          -Dsonar.organization=${{ secrets.ORGANIZATION_NAME }}
-          -Dsonar.projectKey=${{ secrets.PROJECT_KEY }}
-          -Dsonar.java.binaries=.
-          -Dsonar.qualitygate.wait=false
+        run: mvn -V -B sonar:sonar -Dsonar.host.url=${{ secrets.HOST_URL }} -Dsonar.organization=${{ secrets.ORGANIZATION_NAME }} -Dsonar.projectKey=${{ secrets.PROJECT_KEY }} -Dsonar.java.binaries=. -Dsonar.qualitygate.wait=false
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
 
   dependency-check:
 
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'corretto'
           cache: maven
 

README.md

@@ -64,7 +64,8 @@ You should put the .jar in an extra folder as a *logs* and a *db* folder will be
 7. To see the changes just start the new KeepTime again
 
 ## Requirements
-
-* Windows 7, 10
-* Linux (tested on Ubuntu 18.04)
-* Java 11
+* Operating System
+  * Windows 7, 10, 11
+  * Linux (tested on Ubuntu 18.04)
+  * Mac (tested on MacBook M2 Pro (ARM based CPU))
+* Java 17

pom.xml

@@ -1,16 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+    <groupId>org.springframework.boot</groupId>
+    <artifactId>spring-boot-starter-parent</artifactId>
+    <version>3.1.10</version>
+    <relativePath />
+    <!-- lookup parent from repository -->
+  </parent>
   <groupId>de.doubleslash</groupId>
   <artifactId>keeptime</artifactId>
   <version>${project.version}</version>
-  <packaging>jar</packaging>
 
+  <packaging>jar</packaging>
   <name>KeepTime</name>
+
   <description>Time tracker</description>
 
+  <organization>
+    <name>doubleSlash Net-Business GmbH</name>
+    <url>https://www.doubleslash.de/</url>
+  </organization>
+
   <licenses>
     <license>
       <name>GNU General Public License (GPL) version 3.0</name>
@@ -19,26 +32,14 @@
     </license>
   </licenses>
 
-  <organization>
-    <name>doubleSlash Net-Business GmbH</name>
-    <url>https://www.doubleslash.de/</url>
-  </organization>
-
-  <parent>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.5</version>
-    <relativePath /> <!-- lookup parent from repository -->
-  </parent>
-
   <properties>
-    <project.version>1.3.0-SNAPSHOT</project.version>
+    <project.version>2.0.0-SNAPSHOT</project.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <java.version>17</java.version>
+    <javafx.version>22</javafx.version>
 
-    <maven-dependency-check.version>8.0.2</maven-dependency-check.version>
+    <maven-dependency-check.version>9.1.0</maven-dependency-check.version>
     <!-- USING HTML,XML (comma-separated list) did not work with plugin version 5.1.0 -->
     <maven-dependency-check.format>ALL</maven-dependency-check.format>
     <maven-dependency-check.failOnError>true</maven-dependency-check.failOnError>
@@ -50,34 +51,45 @@
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-controls</artifactId>
-      <version>11.0.2</version>
+      <version>${javafx.version}</version>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-fxml</artifactId>
-      <version>11.0.2</version>
+      <version>${javafx.version}</version>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-swing</artifactId>
-      <version>11</version>
+      <version>${javafx.version}</version>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-graphics</artifactId>
-      <version>11.0.2</version>
+      <version>${javafx.version}</version>
       <classifier>win</classifier>
     </dependency>
     <dependency>
       <groupId>org.openjfx</groupId>
       <artifactId>javafx-graphics</artifactId>
-      <version>11.0.2</version>
+      <version>${javafx.version}</version>
       <classifier>linux</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-graphics</artifactId>
+      <version>${javafx.version}</version>
+      <classifier>mac-aarch64</classifier>
+    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-jpa</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
 
     <dependency>
       <groupId>com.h2database</groupId>
@@ -105,64 +117,32 @@
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-assembly-plugin</artifactId>
-      <version>3.4.2</version>
+      <version>3.7.1</version>
       <type>maven-plugin</type>
     </dependency>
     <dependency>
       <groupId>org.sonarsource.scanner.maven</groupId>
       <artifactId>sonar-maven-plugin</artifactId>
-      <version>3.9.1.2184</version>
+      <version>3.11.0.3922</version>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-library</artifactId>
-      <version>2.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <profiles>
-    <profile>
-      <id>coverage</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.7</version>
-            <executions>
-              <execution>
-                <id>prepare-agent</id>
-                <goals>
-                  <goal>prepare-agent</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>report</id>
-                <goals>
-                  <goal>report</goal>
-                </goals>
-                <configuration>
-                  <formats>
-                    <format>XML</format>
-                  </formats>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
   <build>
+    <finalName>keeptime-${project.version}</finalName>
+
     <plugins>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
       </plugin>
 
       <plugin>
-        <groupId>pl.project13.maven</groupId>
-        <artifactId>git-commit-id-plugin</artifactId>
+        <groupId>io.github.git-commit-id</groupId>
+        <artifactId>git-commit-id-maven-plugin</artifactId>
         <configuration>
           <generateGitPropertiesFile>false</generateGitPropertiesFile>
         </configuration>
@@ -181,7 +161,6 @@
               <descriptors>
                 <descriptor>./assembly.xml</descriptor>
               </descriptors>
-              <finalName>keeptime-${project.version}</finalName>
             </configuration>
           </execution>
         </executions>
@@ -207,16 +186,15 @@
           <suppressionFile>dependency-check-report_suppressions.xml</suppressionFile>
         </configuration>
         <executions>
-            <execution>
-                <goals>
-                    <goal>check</goal>
-                </goals>
-            </execution>
+          <execution>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
     </plugins>
   </build>
-
   <!-- generate site with mvn site (including dependency check) -->
   <reporting>
     <plugins>
@@ -242,4 +220,38 @@
       </plugin>
     </plugins>
   </reporting>
-</project>
+
+  <profiles>
+    <profile>
+      <id>coverage</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>0.8.7</version>
+            <executions>
+              <execution>
+                <id>prepare-agent</id>
+                <goals>
+                  <goal>prepare-agent</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>report</id>
+                <goals>
+                  <goal>report</goal>
+                </goals>
+                <configuration>
+                  <formats>
+                    <format>XML</format>
+                  </formats>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

src/main/java/de/doubleslash/keeptime/App.java

@@ -95,6 +95,7 @@ public void init() throws Exception {
 
       model = springContext.getBean(Model.class);
       controller = springContext.getBean(Controller.class);
+      controller.enableAutoSave();
       model.setSpringContext(springContext);
    }
 
@@ -144,6 +145,7 @@ private void initialiseApplication(final Stage primaryStage) throws Exception {
       readSettings();
 
       final List<Work> todaysWorkItems = model.getWorkRepository().findByStartDateOrderByStartTimeAsc(LocalDate.now());
+
       LOG.info("Found {} past work items", todaysWorkItems.size());
       model.getPastWorkItems().addAll(todaysWorkItems);
 
@@ -184,6 +186,7 @@ private void readSettings() {
       final List<Settings> settingsList = model.getSettingsRepository().findAll();
       final Settings settings;
       if (settingsList.isEmpty()) {
+         LOG.info("Empty settings. Set default");
          settings = new Settings();
          settings.setTaskBarColor(model.taskBarColor.get());
 
@@ -197,6 +200,7 @@ private void readSettings() {
          settings.setHideProjectsOnMouseExit(false);
          model.getSettingsRepository().save(settings);
       } else {
+         LOG.info("Got settings from database");
          settings = settingsList.get(0);
       }
 
@@ -239,7 +243,7 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
       final ViewControllerPopup viewControllerPopupController = loader.getController();
       viewControllerPopupController.setStage(popupViewStage);
 
-      if (!OS.isLinux()) {
+      if (OS.isWindows()) {
          globalScreenListener = new GlobalScreenListener();
          globalScreenListener.register(model.useHotkey.get());
          globalScreenListener.setViewController(viewControllerPopupController);