Merge branch 'main' into session_2025_03_22

.github/workflows/multiOSReleases.yml

@@ -4,6 +4,11 @@ on:
   workflow_dispatch:
   release:
     types: [created]
+    inputs:
+      test_mode:
+        description: "Run in test mode (skips release step)"
+        required: false
+        default: "false"
 
 permissions:
   contents: read
@@ -170,6 +175,23 @@ jobs:
           STIRLING_PDF_DESKTOP_UI: true
           BROWSER_OPEN: true
 
+      - name: ☕ Set up JDK (x86_64)
+        if: matrix.os == 'macos-latest'
+        run: |
+          curl -L -o jdk.tar.gz https://cdn.azul.com/zulu/bin/zulu17.56.15-ca-jdk17.0.14-macosx_x64.tar.gz
+          mkdir -p zulu17
+          tar -xzf jdk.tar.gz -C zulu17 --strip-components=1
+          echo "JAVA_HOME=$PWD/zulu17" >> $GITHUB_ENV
+          echo "$PWD/zulu17/bin" >> $GITHUB_PATH
+
+      -   name: Verify JDK architecture
+          if: matrix.os == 'macos-latest'
+          run: file $JAVA_HOME/bin/java
+
+      -   name: Build project and run jpackage (x86_64)
+          if: matrix.os == 'macos-latest'
+          run: arch -x86_64 ./gradlew jpackageMacX64
+
       # Rename and collect artifacts based on OS
       - name: Prepare artifacts
         id: prepare
@@ -181,7 +203,7 @@ jobs:
             mv "./build/jpackage/Stirling-PDF-${{ needs.read_versions.outputs.version }}.exe" "./binaries/Stirling-PDF-win-installer.exe"
           elif [ "${{ matrix.os }}" = "macos-latest" ]; then
             mv "./build/jpackage/Stirling-PDF-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-installer.dmg"
-            mv "./build/jpackage/Stirling-PDF-x86_64-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-x86_64-installer.dmg"
+            mv "./build/jpackage/x86_64/Stirling-PDF (x86_64)-${{ needs.read_versions.outputs.versionMac }}.dmg" "./binaries/Stirling-PDF-mac-x86_64-installer.dmg"
           else
             mv "./build/jpackage/stirling-pdf_${{ needs.read_versions.outputs.version }}-1_amd64.deb" "./binaries/Stirling-PDF-linux-installer.deb"
           fi
@@ -264,10 +286,11 @@ jobs:
           name: ${{ matrix.platform }}signed
           path: |
             ./Stirling-PDF-${{ matrix.platform }}installer.*
-            ./Stirling-PDF-${{ matrix.platform }}-x86_64-installer.*
+            ./Stirling-PDF-${{ matrix.platform }}x86_64-installer.*
             !cosign.*
 
   create-release:
+    if: github.event_name != 'workflow_dispatch' || github.event.inputs.test_mode != 'true'
     needs: [read_versions, sign_verify, sign_verify-portable]
     runs-on: ubuntu-latest
     permissions:

build.gradle

@@ -166,14 +166,12 @@ jpackage {
         appVersion = getMacVersion(project.version.toString())
         icon = "src/main/resources/static/favicon.icns"
         type = "dmg"
-        macPackageIdentifier = "com.stirling.software.pdf"
-        macPackageName = "Stirling-PDF-aarch64"
+        macPackageIdentifier = "Stirling-PDF"
+        macPackageName = "Stirling-PDF"
         macAppCategory = "public.app-category.productivity"
         macSign = false // Enable signing
         macAppStore = false // Not targeting App Store initially
-//
-//        //installDir = "Applications"
-//
+
 //        // Add license and other documentation to DMG
 //        /*macDmgContent = [
 //            "README.md",
@@ -254,16 +252,16 @@ tasks.register('jpackageMacX64') {
         def result = exec {
             commandLine 'jpackage',
                     '--type', 'dmg',
-                    '--name', 'Stirling-PDF-x86_64',
+                    '--name', 'Stirling-PDF (x86_64)',
                     '--input', 'build/libs',
                     '--main-jar', "Stirling-PDF-${project.version}.jar",
-                    '--main-class', 'stirling.software.SPDF.SPDFApplication',
+                    '--main-class', 'org.springframework.boot.loader.launch.JarLauncher',
                     '--runtime-image', file(jrePath + "/zulu-17.jre/Contents/Home"),
-                    '--dest', 'build/jpackage',
+                    '--dest', 'build/jpackage/x86_64',
                     '--icon', 'src/main/resources/static/favicon.icns',
                     '--app-version', getMacVersion(project.version.toString()),
-                    '--mac-package-name', 'Stirling-PDF',
-                    '--mac-package-identifier', 'com.stirling.software.pdf',
+                    '--mac-package-name', 'Stirling-PDF (x86_64)',
+                    '--mac-package-identifier', 'Stirling-PDF (x86_64)',
                     '--mac-app-category', 'public.app-category.productivity'
             standardOutput = outputStream
             errorOutput = errorStream
@@ -283,7 +281,7 @@ tasks.register('jpackageMacX64') {
     }
 }
 
-jpackage.finalizedBy(jpackageMacX64)
+//jpackage.finalizedBy(jpackageMacX64)
 
 tasks.register('downloadTempJre') {
     group = 'distribution'