Refactor packaging scripts and update release naming conventions

Author: ozkanpakdil

.github/workflows/package-and-release.yml

@@ -1,4 +1,4 @@
-name: Package and Release
+name: Package and release the zip
 
 on:
   push:
@@ -89,7 +89,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: "!startsWith(github.ref, 'refs/tags/')"
         with:
-          name: swaggerific-package
+          name: swaggerific-zip
           path: dist/*.zip
 
       - name: Create automatic release (for non-tag pushes)
@@ -99,6 +99,6 @@ jobs:
           repo_token: "${{ secrets.GITHUB_TOKEN }}"
           automatic_release_tag: "latest"
           prerelease: true
-          title: "Latest Development Build"
+          title: "Latest Development Zip Package"
           files: |
             dist/*.zip

package.sh

@@ -43,7 +43,7 @@ cp "$SCRIPT_DIR/target/${APP_NAME}-${VERSION}.jar" "$PACKAGE_DIR/"
 echo "Copying JavaFX modules (version $JAVAFX_VERSION)..."
 
 # Determine OS-specific JavaFX modules for each platform
-PLATFORMS=("linux" "mac" "win")
+PLATFORMS=("linux" "mac" "mac-aarch64" "win")
 JAVAFX_MODULES=(
     "javafx-base"
     "javafx-controls"
@@ -123,13 +123,21 @@ echo "Using JavaFX version: \$JAVAFX_VERSION"
 
 # Determine OS-specific JavaFX modules
 OS_NAME=\$(uname -s)
+ARCH=\$(uname -m)
+
 case "\$OS_NAME" in
     Linux*)     JAVAFX_OS="linux" ;;
-    Darwin*)    JAVAFX_OS="mac" ;;
+    Darwin*)    
+        if [ "\$ARCH" = "arm64" ]; then
+            JAVAFX_OS="mac-aarch64"
+        else
+            JAVAFX_OS="mac"
+        fi
+        ;;
     MINGW*|MSYS*|CYGWIN*) JAVAFX_OS="win" ;;
     *)          JAVAFX_OS="linux" ;;
 esac
-echo "Detected OS: \$JAVAFX_OS"
+echo "Detected OS: \$JAVAFX_OS (Architecture: \$ARCH)"
 
 # Build module path for JavaFX using local lib directory
 JAVAFX_MODULES=(

run.sh

@@ -27,8 +27,12 @@ if [[ "$JAVA_MAJOR_VERSION" -lt 17 ]]; then
     exit 1
 fi
 
+VERSION=$(grep -m 1 "<version>" pom.xml | sed -e 's/<version>\(.*\)<\/version>/\1/' -e 's/[[:space:]]//g')
+APP_NAME="swaggerific"
+PACKAGE_NAME="${APP_NAME}-${VERSION}"
+
 # Check if the JAR file exists
-JAR_FILE="$SCRIPT_DIR/target/swaggerific-0.0.3.jar"
+JAR_FILE="$SCRIPT_DIR/target/${PACKAGE_NAME}.jar"
 if [ ! -f "$JAR_FILE" ]; then
     echo "JAR file not found: $JAR_FILE"
 
@@ -65,13 +69,21 @@ echo "Using JavaFX version: $JAVAFX_VERSION"
 
 # Determine OS-specific JavaFX modules
 OS_NAME=$(uname -s)
+ARCH=$(uname -m)
+
 case "$OS_NAME" in
     Linux*)     JAVAFX_OS="linux" ;;
-    Darwin*)    JAVAFX_OS="mac" ;;
+    Darwin*)    
+        if [ "$ARCH" = "arm64" ]; then
+            JAVAFX_OS="mac-aarch64"
+        else
+            JAVAFX_OS="mac"
+        fi
+        ;;
     MINGW*|MSYS*|CYGWIN*) JAVAFX_OS="win" ;;
     *)          JAVAFX_OS="linux" ;;
 esac
-echo "Detected OS: $JAVAFX_OS"
+echo "Detected OS: $JAVAFX_OS (Architecture: $ARCH)"
 
 # Find Maven repository location
 if [ -d "$HOME/.m2/repository" ]; then