Merge pull request #115 from rainxchzed/macos-universal-installer

Macos architecture matching installer

Author: rainxchzed

.github/workflows/build-desktop-platforms.yml

@@ -5,6 +5,10 @@ on:
     branches:
       - generate-installers
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build-windows:
     runs-on: windows-latest
@@ -20,6 +24,11 @@ jobs:
           java-version: '21'
           cache: 'gradle'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: false
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
         shell: bash
@@ -48,8 +57,7 @@ jobs:
             done
           }
 
-          retry ./gradlew :composeApp:packageExe --no-daemon
-          retry ./gradlew :composeApp:packageMsi --no-daemon
+          retry ./gradlew :composeApp:packageExe :composeApp:packageMsi --no-daemon --parallel
         shell: bash
 
       - name: Upload Windows installers
@@ -60,9 +68,18 @@ jobs:
             composeApp/build/compose/binaries/main/exe/*.exe
             composeApp/build/compose/binaries/main/msi/*.msi
           retention-days: 30
+          compression-level: 6
 
   build-macos:
-    runs-on: macos-latest
+    strategy:
+      matrix:
+        include:
+          - os: macos-13
+            arch: x64
+          - os: macos-14
+            arch: arm64
+
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout code
@@ -75,6 +92,11 @@ jobs:
           java-version: '21'
           cache: 'gradle'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: false
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
@@ -102,18 +124,18 @@ jobs:
             done
           }
 
-          retry ./gradlew :composeApp:packageDmg --no-daemon
-          retry ./gradlew :composeApp:packagePkg --no-daemon
+          retry ./gradlew :composeApp:packageDmg :composeApp:packagePkg --no-daemon --parallel
         shell: bash
 
       - name: Upload macOS installers
         uses: actions/upload-artifact@v4
         with:
-          name: macos-installers
+          name: macos-installers-${{ matrix.arch }}
           path: |
             composeApp/build/compose/binaries/main/dmg/*.dmg
             composeApp/build/compose/binaries/main/pkg/*.pkg
           retention-days: 30
+          compression-level: 6
 
   build-linux:
     runs-on: ubuntu-latest
@@ -129,6 +151,11 @@ jobs:
           java-version: '21'
           cache: 'gradle'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          cache-read-only: false
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
@@ -156,8 +183,7 @@ jobs:
             done
           }
 
-          retry ./gradlew :composeApp:packageDeb --no-daemon
-          retry ./gradlew :composeApp:packageRpm --no-daemon
+          retry ./gradlew :composeApp:packageDeb :composeApp:packageRpm --no-daemon --parallel
         shell: bash
 
       - name: Upload Linux installers
@@ -167,4 +193,5 @@ jobs:
           path: |
             composeApp/build/compose/binaries/main/deb/*.deb
             composeApp/build/compose/binaries/main/rpm/*.rpm
-          retention-days: 30
+          retention-days: 30
+          compression-level: 6

composeApp/build.gradle.kts

@@ -227,7 +227,7 @@ compose.desktop {
     application {
         mainClass = "zed.rainxch.githubstore.MainKt"
         nativeDistributions {
-            packageName = "github-store"
+            packageName = "GitHub-Store"
             packageVersion = appVersionName
             vendor = "rainxchzed"
             includeAllModules = true

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/feature/apps/presentation/AppsViewModel.kt

@@ -81,7 +81,7 @@ class AppsViewModel(
                             downloadProgress = existing?.downloadProgress,
                             error = existing?.error
                         )
-                    }
+                    }.sortedBy { it.installedApp.isUpdateAvailable }
 
                     _state.update {
                         it.copy(