Test.

Author: 23rd

.github/workflows/gradle.yml

@@ -72,43 +72,69 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }}
 
-  build_mac:
+  build_mac_arm:
     runs-on: macos-latest
-
     defaults:
       run:
         shell: bash
-
     steps:
-    - name: Clone.
+    - name: Clone
       uses: actions/checkout@v1
 
-    - name: Set up JDK
+    - name: Set up JDK (ARM64)
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '17'
+        architecture: arm64
 
-    - name: Set up version of Chatty.
+    - name: Set up version of Chatty
       run: |
         git checkout test_ci
         echo `which jpackage`
 
-    - name: Build with Gradle.
+    - name: Build with Gradle (ARM64)
       run: |
         ./gradlew build && \
         ./gradlew release && \
-        ./gradlew jpackageMac -PjpackagePath=`which jpackage`
+        ./gradlew jpackageMacArm -PjpackagePath=`which jpackage`
+
+    - name: Upload Artifacts (ARM64)
+      uses: actions/[email protected]
+      with:
+        name: Chatty-Build-${{ env.NEW_TAG_TEXT }}-arm64
+        path: build/jpackage-mac/*
+
+  build_mac_intel:
+    runs-on: macos-latest
+    defaults:
+      run:
+        shell: bash
+    steps:
+    - name: Clone
+      uses: actions/checkout@v1
+
+    - name: Set up JDK (x64)
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'temurin'
+        java-version: '17'
+        architecture: x64
 
-        ls build
-        echo "===="
-        ls build/releases
-        echo "===="
-        ls build/jpackage-mac
+    - name: Set up version of Chatty
+      run: |
+        git checkout test_ci
+        echo `which jpackage`
+
+    - name: Build with Gradle (x64)
+      run: |
+        ./gradlew build && \
+        ./gradlew release && \
+        ./gradlew jpackageMacIntel -PjpackagePath=`which jpackage`
 
-    - name: Upload Artifacts
+    - name: Upload Artifacts (x64)
       uses: actions/[email protected]
       with:
-        name: Chatty-Build-${{ env.NEW_TAG_TEXT }}
+        name: Chatty-Build-${{ env.NEW_TAG_TEXT }}-x64
         path: build/jpackage-mac/*
 

build.gradle

@@ -321,7 +321,7 @@ task releaseWinSetups(group: 'build') {
 
 def macBundleTarget = new File(buildDir, 'jpackage-mac')
 
-task jpackageMac(type: Exec, group: 'build') {
+task jpackageMacArm(type: Exec, group: 'build') {
     dependsOn shadowJar
 
     def macVersion = '1.0.7' // default
@@ -346,29 +346,77 @@ task jpackageMac(type: Exec, group: 'build') {
 
     def command = [jpackageExec,
         '--type', 'app-image',
-        '--name', 'Chatty',
+        '--name', 'Chatty-arm64',
         '--input', new File(macBundleTarget, 'input'),
         '--main-jar', 'Chatty.jar',
         '--main-class', 'chatty.Chatty',
         '--dest', macBundleTarget,
-        '--description', 'Chatty - Twitch Chat Client',
+        '--description', 'Chatty - Twitch Chat Client (ARM64)',
         '--java-options', '-Xmx600M',
         '--icon', 'assets-bundle/Chatty.icns',
         '--app-version', macVersion,
-        '--vendor', 'Chatty']
+        '--vendor', 'Chatty',
+        '--mac-package-identifier', 'chatty.client.arm64']
 
     commandLine command
 }
 
-task packageApp(type: Zip) {
-    dependsOn jpackageMac
-    from("${macBundleTarget}/Chatty.app")
-    archiveFileName = "Chatty_${version}_mac.app.zip"
+task jpackageMacIntel(type: Exec, group: 'build') {
+    dependsOn shadowJar
+    
+    def macVersion = '1.0.7' // default
+
+    doFirst {
+        delete macBundleTarget
+        copy {
+            from tasks.shadowJar.archivePath
+            into new File(macBundleTarget, 'input')
+        }
+        
+        def versionParts = project.version.replaceAll(/[^0-9.]/, '').split(/\./)
+        macVersion = (versionParts.size() >= 3) ? 
+            "${versionParts[0]}.${versionParts[1]}.${versionParts[2]}" :
+            (versionParts.size() == 2) ? "${versionParts[0]}.${versionParts[1]}.0" :
+            "${versionParts[0]}.0.0"
+        
+        if (macVersion == '..0') macVersion = '1.0.7'
+    }
+
+    def jpackageExec = project.hasProperty('jpackagePath') ? jpackagePath : 'jpackage'
+    
+    def command = [jpackageExec,
+        '--type', 'app-image',
+        '--name', 'Chatty-x64',
+        '--input', new File(macBundleTarget, 'input'),
+        '--main-jar', 'Chatty.jar',
+        '--main-class', 'chatty.Chatty',
+        '--dest', macBundleTarget,
+        '--description', 'Chatty - Twitch Chat Client (Intel)',
+        '--java-options', '-Xmx600M',
+        '--icon', 'assets-bundle/Chatty.icns',
+        '--app-version', macVersion,
+        '--vendor', 'Chatty',
+        '--mac-package-identifier', 'chatty.client.x64']
+    
+    commandLine command
+}
+
+task packageAppArm(type: Zip) {
+    dependsOn jpackageMacArm
+    from("${macBundleTarget}/Chatty-arm64.app")
+    archiveFileName = "Chatty_${version}_mac_arm64.app.zip"
+    destinationDirectory = releasesDir
+}
+
+task packageAppIntel(type: Zip) {
+    dependsOn jpackageMacIntel
+    from("${macBundleTarget}/Chatty-x64.app")
+    archiveFileName = "Chatty_${version}_mac_x64.app.zip"
     destinationDirectory = releasesDir
 }
 
 task releaseMacSetups(group: 'build') {
-    dependsOn packageApp
+    dependsOn packageAppArm, packageAppIntel
 }
 
 //---------