Sync with upstream and store Android saves in Android/media

.github/macports.yml

@@ -0,0 +1,21 @@
+ports:
+  - name: libsdl2
+    select: [ universal ]
+  - name: libpng
+    select: [ universal ]
+  - name: glew
+    select: [ universal ]
+  - name: libzip
+    select: [ universal ]
+  - name: nlohmann-json
+    select: [ universal ]
+  - name: tinyxml2
+    select: [ universal ]
+  - name: libogg
+    select: [ universal ]
+  - name: libopus
+    select: [ universal ]
+  - name: opusfile
+    select: [ universal ]
+  - name: libvorbis
+    select: [ universal ]

.github/workflows/android.yml

@@ -13,14 +13,18 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  # The engine assets are the one thing the app cannot build on-device: packing
+  # them needs the Torch executable, and the NDK build has no host toolchain.
+  # Build it here and ship the result as an APK asset. The game's own assets are
+  # extracted from the user's ROM on-device.
   generate-port-o2r:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
     - name: Install dependencies
-      run: sudo apt-get install gcc g++ git cmake ninja-build lsb-release
+      run: sudo apt-get update && sudo apt-get install -y gcc g++ git cmake ninja-build lsb-release
     - name: ccache
       uses: hendrikmuhs/ccache-action@v1.2.18
       with:
@@ -58,73 +62,85 @@ jobs:
     - uses: actions/checkout@v4
       with:
         submodules: true
-        
+
     - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'
-        
+
     - name: Setup Android SDK
       uses: android-actions/setup-android@v3
-
-    - name: Install NDK 28
+      with:
+        # the default "tools" package is no longer served and fails the step
+        packages: ''
+
+    - name: Install NDK
       run: |
-        echo "y" | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;28.2.12604990" || \
-        echo "y" | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;28.0.12433566"
-
+        echo "y" | sdkmanager --install "ndk;30.0.15729638"
+
     - name: Install dependencies
-      run: sudo apt-get install -y ninja-build
-
+      run: sudo apt-get update && sudo apt-get install -y ninja-build
+
+    # The repository root, not the assets folder: the packaging task in
+    # android/app/build.gradle.kts bundles this into gamedata.zip itself.
     - name: Download starship.o2r
       uses: actions/download-artifact@v4
       with:
         name: starship.o2r
-        path: android/app/src/main/assets 
-        
+        path: .
+
     - name: Configure Gradle permissions
       run: chmod +x android/gradlew
-
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v4
+
     - name: Build Debug APK
       if: matrix.build-type == 'debug'
       run: |
         cd android/
-        ./gradlew assembleDebug -P elfBuildType=RelWithDebInfo
+        ./gradlew assembleDebug
         mv app/build/outputs/apk/debug/app-debug.apk ../starship-debug.apk
-
+
+    # Without a keystore the release build falls back to the debug key, so this
+    # step is allowed to be skipped on forks that have no secrets configured.
     - name: Setup signing keystore
       if: matrix.build-type == 'release' && env.KEYSTORE_FILE != ''
       run: |
-        echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > android/app/starship-release-key.keystore
-        echo "STARSHIP_STORE_FILE=starship-release-key.keystore" >> android/keystore.properties
-        echo "STARSHIP_STORE_PASSWORD=${{ secrets.KEYSTORE_PASSWORD }}" >> android/keystore.properties
-        echo "STARSHIP_KEY_ALIAS=${{ secrets.KEY_ALIAS }}" >> android/keystore.properties
-        echo "STARSHIP_KEY_PASSWORD=${{ secrets.KEY_PASSWORD }}" >> android/keystore.properties
+        echo "${{ secrets.KEYSTORE_FILE }}" | base64 -d > android/app/release.keystore
+        test -s android/app/release.keystore || (echo "Failed to create keystore file" && exit 1)
       env:
         KEYSTORE_FILE: ${{ secrets.KEYSTORE_FILE }}
-        
+
     - name: Build Release APK
       if: matrix.build-type == 'release'
       run: |
         cd android/
-        ./gradlew assembleRelease -P elfBuildType=RelWithDebInfo
+        ./gradlew assembleRelease
         mv app/build/outputs/apk/release/app-release.apk ../starship-release.apk
-
+      env:
+        KEYSTORE_FILE: ${{ secrets.KEYSTORE_FILE != '' && 'release.keystore' || '' }}
+        KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+        KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+        KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+
     - name: Upload Debug APK
       if: matrix.build-type == 'debug'
       uses: actions/upload-artifact@v4
       with:
         name: starship-debug-apk
         path: starship-debug.apk
         retention-days: 7
-        
+
     - name: Upload Release APK
       if: matrix.build-type == 'release'
       uses: actions/upload-artifact@v4
       with:
         name: starship-release-apk
         path: starship-release.apk
         retention-days: 30
-
 
-
+    - name: Clean up keystore
+      if: always()
+      run: rm -f android/app/release.keystore

.github/workflows/mac.yml

@@ -6,24 +6,18 @@ on:
 
 jobs:
   build:
-    runs-on: macOS-latest
+    runs-on: macos-14
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
-      - name: Install dependencies
-        run: brew install sdl2 libpng glew ninja cmake libzip nlohmann-json tinyxml2 spdlog vorbis-tools
+      - uses: melusina-org/setup-macports@v1
+        with:
+          parameters: '.github/macports.yml'
+      - uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: macos # ccache-macos
       - name: Build
         run: |
-          cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release
-          cmake --build build-cmake -j
-      - name: Create Package
-        run: |
-          mkdir starship-release
-          mv build-cmake/Starship starship-release/
-      - name: Publish packaged artifacts
-        uses: actions/upload-artifact@v4
-        with:
-            name: starship-mac-x64
-            path: starship-release
-            retention-days: 1
+          cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
+          cmake --build build-cmake -j

.github/workflows/main.yml

@@ -75,35 +75,38 @@ jobs:
 
   build-macos:
     needs: generate-port-o2r
-    runs-on: macOS-latest
+    runs-on: macos-14
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: recursive
-      - name: Install dependencies
-        run: brew install sdl2 libpng glew ninja cmake libzip nlohmann-json tinyxml2 spdlog vorbis-tools
+      - uses: melusina-org/setup-macports@v1
+        with:
+          parameters: '.github/macports.yml'
+      - uses: hendrikmuhs/ccache-action@v1.2
+        with:
+          key: macos # ccache-macos
       - name: Build
         run: |
-          cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release
-          cmake --build build-cmake --config Release -j3
+          cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
+          cmake --build build-cmake -j
       - name: Download starship.o2r
         uses: actions/download-artifact@v4
         with:
           name: starship.o2r
           path: ./build-cmake
       - name: Create Package
         run: |
-          mkdir starship-release
-          mv build-cmake/Starship starship-release/
-          mv build-cmake/starship.o2r starship-release/
-          mv config.yml starship-release/
-          mv assets starship-release/
-          wget -O starship-release/gamecontrollerdb.txt https://github.com/mdqinc/SDL_GameControllerDB/blob/master/gamecontrollerdb.txt
+          (cd build-cmake && cpack)
+          mv _packages/*.dmg Starship.dmg
+          mv README.md readme.txt
       - name: Publish packaged artifacts
         uses: actions/upload-artifact@v4
         with:
-            name: starship-mac-x64
-            path: starship-release
+          name: Starship-mac
+          path: |
+            Starship.dmg
+            readme.txt
 
   build-linux:
     needs: generate-port-o2r
@@ -181,7 +184,7 @@ jobs:
           cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release
           cmake --build build-cmake --config Release -j3
           (cd build-cmake && cpack -G External)
-          wget -O gamecontrollerdb.txt https://github.com/mdqinc/SDL_GameControllerDB/blob/master/gamecontrollerdb.txt
+          wget -O gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt
           mv README.md readme.txt
           mv build-cmake/*.appimage starship.appimage
       - name: Upload build
@@ -210,12 +213,12 @@ jobs:
           sudo apt-get remove -y cmake
           git -C libultraship remote add nx https://github.com/Net64DD/libultraship.git
           git -C libultraship fetch nx
-          git -C libultraship checkout nx/main-nx
+          git -C libultraship checkout 09dfab5fb2a9a047a6e268dc9db2daad9b2ce5f0
           wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh
           sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir
           cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
           cmake --build build-switch --config Release -j3
-          wget -O gamecontrollerdb.txt https://github.com/mdqinc/SDL_GameControllerDB/blob/master/gamecontrollerdb.txt
+          wget -O gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/master/gamecontrollerdb.txt
           mv README.md readme.txt
           mv build-switch/*.nro Starship.nro
       - name: Upload build
@@ -226,4 +229,4 @@ jobs:
             Starship.nro
             config.yml
             assets
-            gamecontrollerdb.txt
+            gamecontrollerdb.txt