Merge pull request #42 from ledhed2222/dist

trying to build right

Author: ledhed2222

.github/workflows/build-installers.yaml

@@ -0,0 +1,109 @@
+name: Build Native Installers
+
+on:
+  push:
+    tags:
+      - 'v*'         # Only builds on version tags like v2.4.3
+  workflow_dispatch: # Manual trigger from the GitHub UI
+
+jobs:
+  mac:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+
+      - name: Build .jar
+        run: mvn clean package
+
+      - name: Run jpackage for macOS
+        run: |
+          jpackage \
+            --type dmg \
+            --name EWItool \
+            --input target \
+            --main-jar EWItool-2.4.3.jar \
+            --main-class com.github.ledhed2222.ewitool.Main \
+            --dest target \
+            --app-version 2.4.3 \
+            --vendor "Ledhed2222"
+
+      - name: Upload macOS installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: EWItool-macOS
+          path: target/*.dmg
+
+  windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+
+      - name: Build .jar
+        run: mvn clean package
+
+      - name: Run jpackage for Windows
+        run: |
+          jpackage ^
+            --type exe ^
+            --name EWItool ^
+            --input target ^
+            --main-jar EWItool-2.4.3.jar ^
+            --main-class com.github.ledhed2222.ewitool.Main ^
+            --dest target ^
+            --app-version 2.4.3 ^
+            --vendor "Ledhed2222"
+
+      - name: Upload Windows installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: EWItool-Windows
+          path: target/*.exe
+
+  linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 21
+
+      - name: Install jpackage dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libfreetype6-dev libasound2-dev fakeroot rpm
+
+      - name: Build .jar
+        run: mvn clean package
+
+      - name: Run jpackage for Linux
+        run: |
+          jpackage \
+            --type deb \
+            --name EWItool \
+            --input target \
+            --main-jar EWItool-2.4.3.jar \
+            --main-class com.github.ledhed2222.ewitool.Main \
+            --dest target \
+            --app-version 2.4.3 \
+            --vendor "Ledhed2222"
+
+      - name: Upload Linux installer
+        uses: actions/upload-artifact@v4
+        with:
+          name: EWItool-Linux
+          path: target/*.deb

.github/workflows/jdeploy.yml

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <!-- This module was also published with a richer model, Gradle metadata,  -->
-  <!-- which should be used instead. Do not delete the following line which  -->
-  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
-  <!-- that they should prefer consuming it instead. -->
-  <!-- do_not_remove: published-with-gradle-metadata -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.ledhed2222</groupId>
   <artifactId>EWItool</artifactId>
@@ -14,17 +9,14 @@
   <url>https://github.com/ledhed2222/EWItool</url>
 
   <properties>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <javafx.version>17.0.14</javafx.version>
+    <javafx.version>21.0.7</javafx.version>
     <javafx.maven.plugin.version>0.0.8</javafx.maven.plugin.version>
   </properties>
 
   <dependencies>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.3.1</version>
-    </dependency>
     <dependency>
       <groupId>uk.co.xfactory-librarians</groupId>
       <artifactId>coremidi4j</artifactId>
@@ -90,6 +82,7 @@
           </archive>
         </configuration>
       </plugin>
+
     </plugins>
   </build>
 

package.json

@@ -33,8 +33,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
-
-import javax.xml.bind.DatatypeConverter;
+import java.util.HexFormat;
 
 import com.github.ledhed2222.ewitool.UiMain.Status;
 
@@ -314,7 +313,7 @@ byte[] toBytes() {
    */
   EWI4000sPatch( String hexString ) {
     this();
-    patchBlob = DatatypeConverter.parseHexBinary( hexString );
+    patchBlob = HexFormat.of().parseHex( hexString );
     decodeBlob();
     setEmpty( false );
   }