Upgrade to latest libraries and Java 23 release.

TcMenu · Oct 19, 2024 · 3ce33f0 · 3ce33f0
1 parent 4b04722
commit 3ce33f0
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 23 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations/TcMenuDesigner_IntTests.xml b/.idea/runConfigurations/TcMenuDesigner_IntTests.xml
diff --git a/.idea/runConfigurations/TcMenuDesigner_Tests.xml b/.idea/runConfigurations/TcMenuDesigner_Tests.xml
diff --git a/embedCONTROLCore/pom.xml b/embedCONTROLCore/pom.xml
@@ -51,7 +51,7 @@
 
     <properties>
         <jdk.version>22</jdk.version>
-        <jfx.version>22.0.2</jfx.version>
+        <jfx.version>23.0.1</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>

diff --git a/tcMenuGenerator/pom.xml b/tcMenuGenerator/pom.xml
@@ -20,14 +20,14 @@
 
         <!-- production deps -->
         <jdk.version>22</jdk.version>
-        <jfx.version>22.0.2</jfx.version>
+        <jfx.version>23.0.1</jfx.version>
         <jmetro.version>11.6.16</jmetro.version>
         <google.gson.version>2.11.0</google.gson.version>
         <picocli.version>4.7.6</picocli.version>
 
         <!-- test deps -->
-        <junit5.version>5.11.0</junit5.version>
-        <mockito.version>5.12.0</mockito.version>
+        <junit5.version>5.11.2</junit5.version>
+        <mockito.version>5.14.2</mockito.version>
         <testfx.version>4.0.18</testfx.version>
     </properties>
 
@@ -166,7 +166,6 @@
                 <configuration>
                     <source>${jdk.version}</source>
                     <target>${jdk.version}</target>
-                    <!--compilerArgs>enable-preview</compilerArgs-->
                 </configuration>
             </plugin>
             <plugin>

diff --git a/tcMenuGenerator/scripts/buildTcMenuWin.cmd b/tcMenuGenerator/scripts/buildTcMenuWin.cmd
@@ -2,9 +2,9 @@ echo off
 echo "copy over icon"
 copy classes\img\tcMenuDesigner.ico .
 
-jpackage --type app-image -n tcmenu -p jfx/deps --input jfx/app --win-console --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 4.4.0 --verbose --java-options "-Dprism.lcdtext=false --enable-preview -Djava.library.path=$APPDIR/win" --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
+jpackage --type app-image -n tcmenu -p jfx/deps --input jfx/app --win-console --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 4.4.0 --verbose --java-options "-Dprism.lcdtext=false -Djava.library.path=$APPDIR/win" --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
 
-jpackage --type app-image -n tcMenuDesigner -p jfx/deps --input jfx/app  --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 4.4.0 --verbose --java-options "-Dprism.lcdtext=false --enable-preview -Djava.library.path=$APPDIR/win" --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
+jpackage --type app-image -n tcMenuDesigner -p jfx/deps --input jfx/app  --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 4.4.0 --verbose --java-options "-Dprism.lcdtext=false -Djava.library.path=$APPDIR/win" --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
 
 echo "packaging complete, make one package into tcmenu"
 

diff --git a/tcMenuGenerator/scripts/packager-all-platforms.md b/tcMenuGenerator/scripts/packager-all-platforms.md
@@ -38,9 +38,11 @@ Ensure you are in the tcMenuGenerator/target directory. On Windows all these ste
 
     cp classes/img/tcMenuDesigner.ico .
 
-    jpackage --type app-image -n tcmenu -p jfx/deps --input jfx/app --win-console --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 4.4.0-SNAPSHOT --verbose --java-options "-Dprism.lcdtext=false --enable-preview -Djava.library.path=$APPDIR/win" --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
+    jpackage --type app-image -n tcmenu -p jfx/deps --input jfx/app --win-console --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 4.4.0-SNAPSHOT --verbose --java-options "-Dprism.lcdtext=false  -Djava.library.path=$APPDIR/win" --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
+    jpackage --type app-image -n tcmenu -p jfx/deps --input jfx/app --win-console --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 4.3.1 --verbose --java-options "-Dprism.lcdtext=false --enable-preview -Djava.library.path=$APPDIR/win" --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
 
-    jpackage --type app-image -n tcMenuDesigner -p jfx/deps --input jfx/app  --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 4.4.0-SNAPSHOT --verbose --java-options "-Dprism.lcdtext=false --enable-preview -Djava.library.path=$APPDIR/win" --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
+    jpackage --type app-image -n tcMenuDesigner -p jfx/deps --input jfx/app  --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 4.4.0-SNAPSHOT --verbose --java-options "-Dprism.lcdtext=false  -Djava.library.path=$APPDIR/win" --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
+    jpackage --type app-image -n tcMenuDesigner -p jfx/deps --input jfx/app  --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 4.3.1 --verbose --java-options "-Dprism.lcdtext=false --enable-preview -Djava.library.path=$APPDIR/win" --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
 
 Copy the following files from tcMenuDesigner into tcmenu
 
@@ -51,13 +53,13 @@ Copy the following files from tcMenuDesigner into tcmenu
 
 Ensure you are in the tcMenuGenerator/target directory.
 
-    jpackage -n tcMenuDesigner -p jfx/deps --input jfx/app --icon ./classes/img/menu-icon.png --verbose --license-file ../../LICENSE --linux-app-category Development --linux-menu-group "Development;Utility;" --java-options "-Dprism.lcdtext=false --enable-preview -Djava.library.path=$APPDIR/lin" --app-version 4.4.0-SNAPSHOT  --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
+    jpackage -n tcMenuDesigner -p jfx/deps --input jfx/app --icon ./classes/img/menu-icon.png --verbose --license-file ../../LICENSE --linux-app-category Development --linux-menu-group "Development;Utility;" --java-options "-Dprism.lcdtext=false -Djava.library.path=$APPDIR/lin" --app-version 4.4.0-SNAPSHOT  --add-modules "jdk.crypto.cryptoki" -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
 
 ## Packaging - macOS build all versions (without notarization)
 
 Ensure you are in the tcMenuGenerator/target directory.
 
-    jpackage -n tcMenuDesigner -p jfx/deps --input jfx/app --icon ./classes/img/AppIcon.icns --verbose --license-file ../../LICENSE --vendor TheCodersCorner --app-version 4.4.0-SNAPSHOT  --add-modules "jdk.crypto.cryptoki" --java-options "-Dprism.lcdtext=false --enable-preview -Djava.library.path=$APPDIR/mac" --verbose -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
+    jpackage -n tcMenuDesigner -p jfx/deps --input jfx/app --icon ./classes/img/AppIcon.icns --verbose --license-file ../../LICENSE --vendor TheCodersCorner --app-version 4.4.0-SNAPSHOT  --add-modules "jdk.crypto.cryptoki" --java-options "-Dprism.lcdtext=false -Djava.library.path=$APPDIR/mac" --verbose -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
 
 To allow for CLI on macOS: alias tcmenu=/Applications/tcMenuDesigner.app/Contents/MacOS/tcMenuDesigner
 

diff --git a/tcMenuGenerator/src/it/com/thecoderscorner/menu/uitests/EditFontTestCase.java b/tcMenuGenerator/src/it/com/thecoderscorner/menu/uitests/EditFontTestCase.java
@@ -9,16 +9,17 @@
 import com.thecoderscorner.menu.editorui.generator.validation.CannedPropertyValidators;
 import com.thecoderscorner.menu.editorui.util.TestUtils;
 import javafx.scene.Node;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.RadioButton;
 import javafx.stage.Stage;
+import org.assertj.core.api.Assertions;
 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.ComboBoxMatchers;
-import org.testfx.matcher.control.TextInputControlMatchers;
 import org.testfx.util.WaitForAsyncUtils;
 
 import static com.thecoderscorner.menu.editorui.util.TestUtils.clickOnButtonInDialog;
@@ -75,7 +76,8 @@ private Node createFontDialog(FxRobot robot, CreatorProperty prop) throws Interr
         };
         FxAssert.verifyThat(radioToCheck, RadioButton::isSelected);
         FxAssert.verifyThat("#sizeCombo", ComboBoxMatchers.hasSelectedItem(Integer.toString(def.fontNumber())));
-        FxAssert.verifyThat("#fontVarField", TextInputControlMatchers.hasText(def.fontName()));
+        ComboBox<String> comboBox = robot.lookup("#fontVarField").queryComboBox();
+        Assertions.assertThat(comboBox.getEditor().getText()).isEqualTo(def.fontName());
 
         return robot.lookup(".fontDialog").query();
     }

diff --git a/tcMenuJavaApi/pom.xml b/tcMenuJavaApi/pom.xml
@@ -50,17 +50,18 @@
 
     <properties>
         <jdk.version>22</jdk.version>
-        <jfx.version>22.0.2</jfx.version>
-        <junit5.version>5.11.0</junit5.version>
-        <mockito.version>5.12.0</mockito.version>
+        <jfx.version>23.0.1</jfx.version>
+        <junit5.version>5.11.2</junit5.version>
+        <mockito.version>5.14.2</mockito.version>
         <hamcrest.version>3.0</hamcrest.version>
+        <google.gson.version>2.11.0</google.gson.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.11.0</version>
+            <version>${google.gson.version}</version>
         </dependency>
 
         <!-- test dependencies -->
@@ -137,8 +138,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.13.0</version>
                 <configuration>
-                    <source>${jdk.version}</source>
-                    <target>${jdk.version}</target>
+                    <source>11</source>
+                    <target>11</target>
                 </configuration>
             </plugin>
             <plugin>