Merge pull request #488 from TcMenu/feature/ci-cd

Initial CI/CD support
TcMenu · Aug 26, 2024 · 65c3b6b · 65c3b6b
2 parents a0670ba + 2479102
commit 65c3b6b
Show file tree

Hide file tree

Showing 25 changed files with 113 additions and 131 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,32 @@
+name: Build
+
+on:
+  push:
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 22
+      uses: actions/setup-java@v4
+      with:
+        java-version: '22'
+        distribution: 'liberica'
+        cache: maven
+
+    - name: Build embedCONTROLCore
+      run: mvn -B install -Dgpg.skip=true --file embedCONTROLCore/pom.xml
+
+    - name: Build tcMenuJavaApi
+      run: mvn -B install -Dgpg.skip=true --file tcMenuJavaApi/pom.xml
+
+    - name: Build tcMenuGenerator
+      run: mvn -B compile -Dgpg.skip=true --file tcMenuGenerator/pom.xml
+
+    - name: Build embeddedJavaExample
+      run: mvn -B package --file embeddedJavaExample/pom.xml
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 builtPlugins
+.idea/
 
 # Avoid ignoring Maven wrapper jar file (.jar files are usually ignored)
 !/.mvn/wrapper/maven-wrapper.jar

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
diff --git a/README.md b/README.md
@@ -1,4 +1,9 @@
 ## tcMenu - A menu library and designer for Arduino and mbed with IoT capabilities
+[![Java Build](https://github.com/TcMenu/tcMenu/actions/workflows/build.yml/badge.svg)](https://github.com/TcMenu/tcMenu/actions/workflows/build.yml)
+[![License: Apache 2.0](https://img.shields.io/badge/license-Apache--2.0-green.svg)](https://github.com/TcMenu/tcMenu/blob/main/LICENSE)
+[![GitHub release](https://img.shields.io/github/release/TcMenu/tcMenu.svg?maxAge=3600)](https://github.com/TcMenu/tcMenu/releases)
+[![davetcc](https://img.shields.io/badge/davetcc-dev-blue.svg)](https://github.com/davetcc)
+[![JSC TechMinds](https://img.shields.io/badge/JSC-TechMinds-green.svg)](https://www.jsctm.cz)
 
 A menu library and designer UI for Arduino and mbed that is modular enough to support different input methods, display modules and IoT / remote control methods. TcMenu is more than just an Arduino menu library, think of it as a framework for building IoT applications that includes the ability to render menus locally onto a display.
 

diff --git a/embedCONTROLCore/pom.xml b/embedCONTROLCore/pom.xml
@@ -50,15 +50,12 @@
     </scm>
 
     <properties>
-        <jdk.version>21</jdk.version>
-        <jfx.version>21.0.2</jfx.version>
-        <jserialcomm.version>2.10.4</jserialcomm.version>
-        <google.gson.version>2.10</google.gson.version>
-        <springframework.version>6.0.11</springframework.version>
-        <junit5.surefire.version>1.3.2</junit5.surefire.version>
-        <junit5.version>5.10.2</junit5.version>
-        <mockito.version>5.10.0</mockito.version>
-        <hamcrest.version>2.2</hamcrest.version>
+        <jdk.version>22</jdk.version>
+        <jfx.version>22.0.2</jfx.version>
+        <jserialcomm.version>2.11.0</jserialcomm.version>
+        <google.gson.version>2.11.0</google.gson.version>
+        <junit5.version>5.11.0</junit5.version>
+        <mockito.version>5.12.0</mockito.version>
     </properties>
 
     <dependencies>
@@ -82,13 +79,13 @@
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.7.2</version>
+            <version>2.7.3</version>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>2.0.12</version>
+            <version>2.0.16</version>
         </dependency>
 
         <dependency>
@@ -104,12 +101,6 @@
 
         <!-- END JavaFX notes -->
 
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-surefire-provider</artifactId>
-            <version>${junit5.surefire.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
@@ -125,7 +116,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.25.2</version>
+            <version>3.26.3</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -136,7 +127,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>${jdk.version}</source>
                     <target>${jdk.version}</target>
@@ -145,12 +136,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
+                <version>3.4.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -163,7 +154,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.8.0</version>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -176,7 +167,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.2.5</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -190,7 +181,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.13</version>
+                <version>1.7.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>
@@ -201,7 +192,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
+                <version>3.1.1</version>
                 <configuration>
                     <autoVersionSubmodules>true</autoVersionSubmodules>
                     <useReleaseProfile>false</useReleaseProfile>

diff --git a/embeddedJavaExample/pom.xml b/embeddedJavaExample/pom.xml
@@ -7,9 +7,9 @@
     <version>0.0.1-SNAPSHOT</version>
 
     <properties>
-        <jdk.version>20</jdk.version>
-        <jfx.version>21.0.2</jfx.version>
-        <jserialcomm.version>2.9.2</jserialcomm.version>
+        <jdk.version>22</jdk.version>
+        <jfx.version>22.0.2</jfx.version>
+        <jserialcomm.version>2.11.0</jserialcomm.version>
         <tcmenu.api.version>4.3.0</tcmenu.api.version>
         <timestamp>${maven.build.timestamp}</timestamp>
     </properties>
@@ -33,7 +33,7 @@
 
         <!--
         !!!!!!!JavaFX - Special notes!!!!!!
-        If you are using BellSoft's Liberica Full JDK leave the below scopes set to "test"
+        If you are using BellSoft Liberica Full JDK leave the below scopes set to "test"
         If you are using another JDK without JavaFX, comment out the scope for each org.openjfx component.
          -->
 
@@ -53,19 +53,19 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
-            <version>10.0.14</version>
+            <version>10.0.23</version>
         </dependency>
 
         <!-- To run javax.websocket in embedded server -->
         <dependency>
             <groupId>org.eclipse.jetty.websocket</groupId>
             <artifactId>websocket-javax-server</artifactId>
-            <version>10.0.14</version>
+            <version>10.0.23</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-jdk14</artifactId>
-            <version>1.7.36</version>
+            <version>2.0.16</version>
         </dependency>
 
     </dependencies>
@@ -92,7 +92,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>${jdk.version}</source>
                     <target>${jdk.version}</target>
@@ -102,7 +102,7 @@
                 <!-- copy all the JARs for the dependencies into the jfx/deps folder -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.8.0</version>
                 <executions>
                     <execution>
                         <id>copy-dependencies</id>
@@ -137,7 +137,7 @@
                 <!-- copy the application JAR file from target dir into jfx/deps -->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>copy-resources-jar</id>
@@ -163,7 +163,7 @@
             <plugin>
                 <!-- copy the data folder into the jfx/app folder -->
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>copy-resources-logging</id>

diff --git a/...JavaExample/src/main/java/com/thecoderscorner/menuexample/tcmenu/EmbeddedJavaDemoApp.java b/...JavaExample/src/main/java/com/thecoderscorner/menuexample/tcmenu/EmbeddedJavaDemoApp.java
@@ -48,7 +48,7 @@ public void buildMenuInMenuComponents() {
         MenuCommandProtocol protocol = context.getBean(MenuCommandProtocol.class);
         ScheduledExecutorService executor = context.getBean(ScheduledExecutorService.class);
         LocalIdentifier localId = new LocalIdentifier(menuManager.getServerUuid(), menuManager.getServerName());
-        var remMenuAvrBoardConnector = new SocketBasedConnector(localId, executor, Clock.systemUTC(), protocol, "192.168.0.96", 3333, ConnectMode.FULLY_AUTHENTICATED);
+        var remMenuAvrBoardConnector = new SocketBasedConnector(localId, executor, Clock.systemUTC(), protocol, "192.168.0.96", 3333, ConnectMode.FULLY_AUTHENTICATED, null);
         var remMenuAvrBoard = new MenuInMenu(remMenuAvrBoardConnector, menuManager, menuManager.getManagedMenu().getMenuById(16).orElseThrow(), MenuInMenu.ReplicationMode.REPLICATE_ADD_STATUS_ITEM, 100000, 65000);
         remMenuAvrBoard.start();
     }

diff --git a/tcMenuGenerator/pom.xml b/tcMenuGenerator/pom.xml
@@ -19,17 +19,15 @@
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
 
         <!-- production deps -->
-        <jfx.version>21.0.2</jfx.version>
+        <jdk.version>22</jdk.version>
+        <jfx.version>22.0.2</jfx.version>
         <jmetro.version>11.6.16</jmetro.version>
-        <google.gson.version>2.10</google.gson.version>
-        <picocli.version>4.7.5</picocli.version>
-        <springframework.version>6.0.11</springframework.version>
+        <google.gson.version>2.11.0</google.gson.version>
+        <picocli.version>4.7.6</picocli.version>
 
         <!-- test deps -->
-        <junit5.surefire.version>1.3.2</junit5.surefire.version>
-        <junit5.version>5.10.2</junit5.version>
-        <mockito.version>5.10.0</mockito.version>
-        <hamcrest.version>2.2</hamcrest.version>
+        <junit5.version>5.11.0</junit5.version>
+        <mockito.version>5.12.0</mockito.version>
         <testfx.version>4.0.18</testfx.version>
     </properties>
 
@@ -62,7 +60,7 @@
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.7.2</version>
+            <version>2.7.3</version>
         </dependency>
 
         <dependency>
@@ -116,12 +114,6 @@
 
         <!-- test only dependencies start -->
 
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-surefire-provider</artifactId>
-            <version>${junit5.surefire.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
@@ -170,20 +162,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.0</version>
+                <version>3.13.0</version>
                 <configuration>
-                    <source>22</source>
-                    <target>22</target>
+                    <source>${jdk.version}</source>
+                    <target>${jdk.version}</target>
                     <compilerArgs>--enable-preview</compilerArgs>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M3</version>
-                <configuration>
-                    <excludes>com/thecoderscorner/menu/editorint/**</excludes>
-                </configuration>
+                <version>3.4.0</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -220,7 +209,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <id>copy-resources-logging</id>
@@ -296,7 +285,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.7.1</version>
                 <executions>
                     <execution>
                         <phase>compile</phase> <!-- bind to the packaging phase -->

diff --git a/...erator/src/test/java/com/thecoderscorner/menu/editorint/uitests/AboutDialogTestCases.java b/...erator/src/test/java/com/thecoderscorner/menu/editorint/uitests/AboutDialogTestCases.java
@@ -6,24 +6,17 @@
 
 package com.thecoderscorner.menu.editorint.uitests;
 
-import com.thecoderscorner.menu.editorui.generator.core.CreatorProperty;
-import com.thecoderscorner.menu.editorui.storage.ConfigurationStorage;
 import com.thecoderscorner.menu.editorui.dialog.AboutDialog;
+import com.thecoderscorner.menu.editorui.storage.ConfigurationStorage;
 import javafx.application.Platform;
-import javafx.scene.Node;
-import javafx.scene.control.RadioButton;
 import javafx.stage.Stage;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.testfx.api.FxAssert;
 import org.testfx.api.FxRobot;
 import org.testfx.framework.junit5.ApplicationExtension;
 import org.testfx.framework.junit5.Start;
-import org.testfx.matcher.control.TextInputControlMatchers;
 
-import static com.thecoderscorner.menu.editorui.generator.parameters.FontDefinition.fromString;
-import static com.thecoderscorner.menu.editorui.util.TestUtils.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 import static org.testfx.api.FxAssert.verifyThat;