Update build settings

.github/actions/notarize/action.yml

@@ -9,12 +9,6 @@ inputs:
   app-store-key-issuer-id:
     description: App Store key issuer ID
     required: true
-  archive-path:
-    description: Xcode archive path
-    required: true
-  export-path:
-    description: The path to export the archive to
-    required: true
 runs:
   using: composite
   steps:
@@ -24,28 +18,8 @@ runs:
     run: |
       echo "${{ inputs.app-store-key }}" > AuthKey_${{ inputs.app-store-key-id }}.p8
 
-      echo '{"destination":"export","method":"developer-id"}' \
+      ditto -c -k --keepParent Release/Burrow.app Upload.zip
-        | plutil -convert xml1 -o ExportOptions.plist -
+      xcrun notarytool submit --wait --issuer ${{ inputs.app-store-key-issuer-id }} --key-id ${{ inputs.app-store-key-id }} --key "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" Upload.zip
+      xcrun stapler staple Release/Burrow.app
 
-      xcodebuild -exportArchive \
+      rm -rf AuthKey_${{ inputs.app-store-key-id }}.p8 Release
-        -allowProvisioningUpdates \
-        -allowProvisioningDeviceRegistration \
-        -skipPackagePluginValidation \
-        -skipMacroValidation \
-        -onlyUsePackageVersionsFromResolvedFile \
-        -authenticationKeyID ${{ inputs.app-store-key-id }} \
-        -authenticationKeyIssuerID ${{ inputs.app-store-key-issuer-id }} \
-        -authenticationKeyPath "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" \
-        -archivePath Wallet.xcarchive \
-        -exportPath Release \
-        -exportOptionsPlist ExportOptions.plist
-
-      ditto -c -k --keepParent Release/Wallet.app Upload.zip
-      SUBMISSION_ID=$(xcrun notarytool submit --issuer ${{ inputs.app-store-key-issuer-id }} --key-id ${{ inputs.app-store-key-id }} --key "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8" Upload.zip | awk '/ id:/ { print $2; exit }')
-
-      xcrun notarytool wait $SUBMISSION_ID --issuer ${{ inputs.app-store-key-issuer-id }} --key-id ${{ inputs.app-store-key-id }} --key "${PWD}/AuthKey_${{ inputs.app-store-key-id }}.p8"
-      xcrun stapler staple Release/Wallet.app
-
-      aa archive -a lzma -b 8m -d Release -subdir Wallet.app -o Wallet.app.aar
-
-      rm -rf Upload.zip Release AuthKey_${{ inputs.app-store-key-id }}.p8 ExportOptions.plist

.github/workflows/build-apple.yml

@@ -24,7 +24,7 @@ jobs:
           rust-targets:
           - aarch64-apple-ios
         - scheme: App
-          destination: platform=iOS Simulator,OS=17.2,name=iPhone 15 Pro
+          destination: platform=iOS Simulator,OS=18.0,name=iPhone 15 Pro
           platform: iOS Simulator
           sdk-name: iphonesimulator
           rust-targets:
@@ -38,7 +38,7 @@ jobs:
           - x86_64-apple-darwin
           - aarch64-apple-darwin
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_16.0.app/Contents/Developer
     steps:
     - name: Checkout
       uses: actions/checkout@v3

.github/workflows/build-rpm.yml

@@ -5,7 +5,7 @@ jobs:
     name: Build RPM
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: Swatinem/rust-cache@v2
     - name: Install RPM
       run: cargo install cargo-generate-rpm

.github/workflows/build-rust.yml

@@ -22,14 +22,18 @@ jobs:
           targets:
           - aarch64-unknown-linux-gnu
         - os: macos-12
-          platform: macOS
+          platform: macOS (Intel)
           test-targets:
           - x86_64-apple-darwin
           targets:
+          - x86_64-apple-ios
+        - os: macos-14
+          platform: macOS
+          test-targets:
           - aarch64-apple-darwin
+          targets:
           - aarch64-apple-ios
           - aarch64-apple-ios-sim
-          - x86_64-apple-ios
         - os: windows-2022
           platform: Windows
           test-targets:
@@ -38,7 +42,7 @@ jobs:
           - aarch64-pc-windows-msvc
     runs-on: ${{ matrix.os }}
     env:
-      DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
       CARGO_INCREMENTAL: 0
       CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER: aarch64-linux-gnu-gcc
       RUST_BACKTRACE: short

.github/workflows/release-apple.yml

@@ -13,7 +13,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - destination: generic/platform=iOS
+        - 
+          destination: generic/platform=iOS
           platform: iOS
           rust-targets:
           - aarch64-apple-ios
@@ -23,7 +24,7 @@ jobs:
           - x86_64-apple-darwin
           - aarch64-apple-darwin
     env:
-      DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
+      DEVELOPER_DIR: /Applications/Xcode_15.4.app/Contents/Developer
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -50,25 +51,23 @@ jobs:
         app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
         app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
         archive-path: Burrow.xcarchive
-    - name: Notarize (macOS)
+    - name: Export
-      if: ${{ matrix.platform == 'macOS' }}
-      uses: ./.github/actions/notarize
-      with:
-        app-store-key: ${{ secrets.APPSTORE_KEY }}
-        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
-        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
-        archive-path: Burrow.xcarchive
-    - name: Export IPA (iOS)
-      if: ${{ matrix.platform == 'iOS' }}
       uses: ./.github/actions/export
       with:
-        method: ad-hoc
+        method: ${{ matrix.platform == 'macOS' && 'developer-id' || 'ad-hoc' }}
         destination: export
         app-store-key: ${{ secrets.APPSTORE_KEY }}
         app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
         app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
         archive-path: Burrow.xcarchive
         export-path: Release
+    - name: Notarize
+      if: ${{ matrix.platform == 'macOS' }}
+      uses: ./.github/actions/notarize
+      with:
+        app-store-key: ${{ secrets.APPSTORE_KEY }}
+        app-store-key-id: ${{ secrets.APPSTORE_KEY_ID }}
+        app-store-key-issuer-id: ${{ secrets.APPSTORE_KEY_ISSUER_ID }}
     - name: Compress (iOS)
       if: ${{ matrix.platform == 'iOS' }}
       shell: bash
@@ -83,27 +82,17 @@ jobs:
         aa archive -a lzma -b 8m -d Apple/Release -subdir Burrow.app -o Burrow.app.aar
         aa archive -a lzma -b 8m -d Apple -subdir Burrow.xcarchive -o Burrow-${{ matrix.platform }}.xcarchive.aar
         rm -rf Apple/Release
-    - name: Upload to GitHub (iOS)
+    - name: Upload to GitHub
-      if: ${{ matrix.platform == 'iOS' }}
       uses: SierraSoftworks/gh-releases@v1.0.7
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         release_tag: ${{ github.ref_name }}
         overwrite: 'true'
         files: |
-          Burrow.ipa 
+          ${{ matrix.platform == 'macOS' && 'Burrow.aap.aar' || 'Burrow.ipa' }}
-          Burrow-${{ matrix.platform }}.xcarchive.aar
-    - name: Upload to GitHub (macOS)
-      if: ${{ matrix.platform == 'macOS' }}
-      uses: SierraSoftworks/gh-releases@v1.0.7
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        release_tag: ${{ github.ref_name }}
-        overwrite: 'true'
-        files: |
-          Burrow.aap.aar
           Burrow-${{ matrix.platform }}.xcarchive.aar
     - name: Upload to App Store Connect
+      if: ${{ matrix.platform == 'iOS' }}
       uses: ./.github/actions/export
       with:
         method: app-store

Apple/App/AppDelegate.swift

@@ -2,8 +2,7 @@
 import AppKit
 import SwiftUI
 
-@MainActor
+@MainActor @main
-@NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
     private let quitItem: NSMenuItem = {
         let quitItem = NSMenuItem(

Apple/App/MainMenu.xib

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23077.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23077.2"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/library/rust:1.77-slim-bookworm AS builder
+FROM docker.io/library/rust:1.79-slim-bookworm AS builder
 
 ARG TARGETPLATFORM
 ARG LLVM_VERSION=16
@@ -56,7 +56,6 @@ ENV CC_x86_64_unknown_linux_musl=clang-$LLVM_VERSION \
     AR_aarch64_unknown_linux_musl=llvm-ar-$LLVM_VERSION \
     CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-L/usr/lib/x86_64-linux-musl -L/lib/x86_64-linux-musl -C linker=rust-lld" \
     CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-L/usr/lib/aarch64-linux-musl -L/lib/aarch64-linux-musl -C linker=rust-lld" \
-    CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse \
     SQLITE3_STATIC=1 \
     SQLITE3_INCLUDE_DIR=/usr/local/include \
     SQLITE3_LIB_DIR=/usr/local/lib