Merge pull request #50 from ledhed2222/build-and-deps

Build and deps

Author: ledhed2222

.github/workflows/build-installers.yaml

@@ -7,8 +7,8 @@ on:
   workflow_dispatch: # Manual trigger from the GitHub UI
 
 jobs:
-  mac-intel:
-    runs-on: macos-13  # Intel runner
+  macos:
+    runs-on: macos-latest  # ARM runner (Apple Silicon, works on Intel via Rosetta 2)
     steps:
       - uses: actions/checkout@v4
 
@@ -28,7 +28,7 @@ jobs:
       - name: Build .jar
         run: mvn clean package
 
-      - name: Run jpackage for macOS Intel
+      - name: Run jpackage for macOS
         run: |
           jpackage \
             --type dmg \
@@ -41,59 +41,14 @@ jobs:
             --vendor "Ledhed2222" \
             --icon src/main/resources/logo.icns
 
-      - name: Rename DMG to include architecture
+      - name: Rename DMG
         run: |
-          mv target/EWItool-${{ steps.version.outputs.version }}.dmg target/EWItool-${{ steps.version.outputs.version }}-macos-intel.dmg
+          mv target/EWItool-${{ steps.version.outputs.version }}.dmg target/EWItool-${{ steps.version.outputs.version }}-macos.dmg
 
       - name: Upload to gh release
         uses: softprops/action-gh-release@v1
         with:
-          files: target/*-macos-intel.dmg
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  mac-silicon:
-    runs-on: macos-latest  # ARM runner (M1/M2)
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 21
-
-      - name: Extract version from pom.xml
-        id: version
-        run: |
-          VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          echo "Building version: $VERSION"
-
-      - name: Build .jar
-        run: mvn clean package
-
-      - name: Run jpackage for macOS Silicon
-        run: |
-          jpackage \
-            --type dmg \
-            --name EWItool \
-            --input target \
-            --main-jar EWItool-${{ steps.version.outputs.version }}.jar \
-            --main-class com.github.ledhed2222.ewitool.Main \
-            --dest target \
-            --app-version ${{ steps.version.outputs.version }} \
-            --vendor "Ledhed2222" \
-            --icon src/main/resources/logo.icns
-
-      - name: Rename DMG to include architecture
-        run: |
-          mv target/EWItool-${{ steps.version.outputs.version }}.dmg target/EWItool-${{ steps.version.outputs.version }}-macos-silicon.dmg
-
-      - name: Upload to gh release
-        uses: softprops/action-gh-release@v1
-        with:
-          files: target/*-macos-silicon.dmg
+          files: target/*-macos.dmg
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

pom.xml

@@ -4,16 +4,18 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.ledhed2222</groupId>
   <artifactId>EWItool</artifactId>
-  <version>2.5.1</version>
+  <version>2.6.0</version>
   <name>EWItool</name>
   <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>21.0.7</javafx.version>
+    <javafx.version>23.0.2</javafx.version>
     <javafx.maven.plugin.version>0.0.8</javafx.maven.plugin.version>
+    <maven.dependency.plugin.version>3.9.0</maven.dependency.plugin.version>
+    <maven.jar.plugin.version>3.5.0</maven.jar.plugin.version>
     <mainClass>com.github.ledhed2222.ewitool.Main</mainClass>
   </properties>
 
@@ -73,6 +75,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
+        <version>${maven.dependency.plugin.version}</version>
         <executions>
           <execution>
             <id>copy-dependencies</id>
@@ -91,7 +94,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>${maven.jar.plugin.version}</version>
         <configuration>
           <archive>
             <manifest>

src/main/java/com/github/ledhed2222/ewitool/UiMain.java

@@ -38,7 +38,7 @@
 public class UiMain extends Application {
 
   static final String  APP_NAME = "EWItool";
-  static final String  APP_VERSION = "2.5.1";
+  static final String  APP_VERSION = "2.6.0";
   static final int     COPYRIGHT_YEAR = 2025;
   static final String  RELEASE_STATUS = "Production";
   static final String  LEAD_AUTHOR = "S.Merrony & ledhed2222";