Add files via upload

- bump SDL to 2.32.0
    - bump NDK to r27c
    - bump AGP to 8.8.0
    - bump Gradle to 8.10.2
    - bump CMake to 3.31.5
    - bump targetSdkVersion to 34
    - add GitHub Actions Release support (Debug)
    - add Special External Storage Permission support
    - fix "assets not found" error on first launch
    - add Android 5 & 6 support

.github/workflows/android-build.yml

@@ -0,0 +1,74 @@
+name: generate-android-apk
+
+on:
+  workflow_dispatch:
+
+jobs:
+  generate-2ship-otr:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y ninja-build cmake g++ gcc libzip-dev zipcmp zipmerge ziptool
+      - name: Install latest SDL
+        run: |
+          if [ ! -d "SDL2-2.28.5" ]; then
+            wget https://github.com/libsdl-org/SDL/releases/download/release-2.28.5/SDL2-2.28.5.tar.gz
+            tar -xzf SDL2-2.28.5.tar.gz
+          fi
+          cd SDL2-2.28.5
+          ./configure --enable-hidapi-libusb
+          make -j 10
+          sudo make install
+          sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
+      - name: Install latest tinyxml2
+        run: |
+          sudo apt-get remove libtinyxml2-dev
+          if [ ! -d "tinyxml2-10.0.0" ]; then
+            wget https://github.com/leethomason/tinyxml2/archive/refs/tags/10.0.0.tar.gz
+            tar -xzf 10.0.0.tar.gz
+          fi
+          cd tinyxml2-10.0.0
+          mkdir -p build
+          cd build
+          cmake ..
+          make
+          sudo make install
+      - name: Generate 2ship.o2r
+        run: |
+          cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
+          cmake --build build-cmake --config Release --target Generate2ShipOtr -j3
+      - uses: actions/upload-artifact@v4
+        with:
+          name: 2ship.o2r
+          path: 2ship.o2r
+          retention-days: 1
+
+  build-android:
+    needs: generate-2ship-otr
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+      - name: Install dependencies
+        run: sudo apt-get install -y ninja-build
+      - name: Download 2ship.o2r
+        uses: actions/download-artifact@v4
+        with:
+          name: 2ship.o2r
+          path: Android/app/src/main/assets
+      - name: Build 2Ship APK
+        run: |
+          cd Android/
+          ./gradlew assembleDebug -P elfBuildType=RelWithDebInfo
+          mv app/build/outputs/apk/debug/app-debug.apk ../2ship.apk
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: 2ship-apk
+          path: 2ship.apk

.github/workflows/apt-deps.txt

@@ -1 +1 @@
-libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev ninja-build
+libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev nlohmann-json3-dev libtinyxml2-dev libspdlog-dev ninja-build

.github/workflows/gtar

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Call the original gtar executable with sudo for macports cache restoration to root folder
+exec sudo /opt/homebrew/bin/gtar.orig "$@"

.github/workflows/pr-artifacts.yml

@@ -12,7 +12,7 @@ jobs:
     if: ${{ github.event.workflow_run.event == 'pull_request' }}
     steps:
       - id: 'pr-number'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           result-encoding: string
           script: |
@@ -20,8 +20,9 @@ jobs:
             const pullHeadSHA = '${{github.event.workflow_run.head_sha}}';
             const pullUserId = ${{github.event.sender.id}};
             const prNumber = await (async () => {
-              const pulls = await github.rest.pulls.list({owner, repo});
-              for await (const {data} of github.paginate.iterator(pulls)) {
+              for await (const { data } of github.paginate.iterator(
+                github.rest.pulls.list, { owner, repo }
+              )) {
                 for (const pull of data) {
                   if (pull.head.sha === pullHeadSHA && pull.user.id === pullUserId) {
                     return pull.number;
@@ -36,7 +37,7 @@ jobs:
 
             return prNumber;
       - id: 'artifacts-text'
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           result-encoding: string
           script: |
@@ -48,12 +49,13 @@ jobs:
 
             return allArtifacts.data.artifacts.reduce((acc, item) => {
               if (item.name === "assets") return acc;
+              if (item.name === "2ship.o2r") return acc;
               acc += `
-              - [${item.name}.zip](https://nightly.link/${context.repo.owner}/${context.repo.repo}/actions/artifacts/${item.id}.zip?h=20a00267c7ffeb2eb80ab31f356f2ba5f120f43c)`;
+              - [${item.name}.zip](https://nightly.link/${context.repo.owner}/${context.repo.repo}/actions/artifacts/${item.id}.zip)`;
               return acc;
             }, '### Build Artifacts');
       - id: 'add-to-pr'
-        uses: garrettjoecox/pr-section@3.1.0
+        uses: garrettjoecox/pr-section@4.0.0
         with:
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
           pr-number: ${{ steps.pr-number.outputs.result }}

.gitignore

@@ -66,3 +66,7 @@ _packages/
 
 /mm/src/boot/build.c
 /mm/windows/properties.h
+/clang-format.exe
+
+# IntelliJ / Android Studio
+.idea

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "libultraship"]
 	path = libultraship
-	url = https://github.com/Waterdish/libultraship.git
+	url = https://github.com/robertkirkman/libultraship.git
 [submodule "OTRExporter"]
 	path = OTRExporter
 	url = https://github.com/Waterdish/OTRExporter.git

Android/.gitignore

@@ -14,6 +14,7 @@ captures/
 .cxx/
 *.apk
 output.json
+app/release/
 
 # IntelliJ
 *.iml

Android/app/build.gradle

@@ -1,4 +1,4 @@
-def buildAsLibrary = project.hasProperty('BUILD_AS_LIBRARY');
+def buildAsLibrary = project.hasProperty('BUILD_AS_LIBRARY')
 def buildAsApplication = !buildAsLibrary
 if (buildAsApplication) {
     apply plugin: 'com.android.application'
@@ -8,25 +8,21 @@ else {
 }
 
 android {
-    ndkPath "/home/waterdish/Android/Sdk/ndk/26.0.10792818"  // Point to your own NDK
-    compileSdkVersion 31
+    ndkVersion '27.2.12479018'
+    compileSdkVersion 34
     defaultConfig {
         if (buildAsApplication) {
             applicationId "com.dishii.mm"
         }
-        minSdkVersion 19
-        targetSdkVersion 31
-        versionCode 1
-        versionName "1.0.0"
+        minSdkVersion 21
+        //noinspection OldTargetApi
+        targetSdkVersion 34
+        versionCode 4
+        versionName "1.1.1"
         externalNativeBuild {
-            //ndkBuild {
-            //    arguments "APP_PLATFORM=android-23"
-            //    abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-            //}
             cmake {
-                 arguments "-DANDROID_APP_PLATFORM=android-23","-DSDL_SHARED=ON", "-DANDROID_STL=c++_static", "-DHAVE_LD_VERSION_SCRIPT=OFF",'-DUSE_OPENGLES=ON',"-DCVAR_IMGUI_CONTROLLER_NAV=1"
+                 arguments "-DANDROID_APPNAME=${applicationId}", "-DANDROID_APP_PLATFORM=android-21", "-DANDROID_STL=c++_static", "-DHAVE_LD_VERSION_SCRIPT=OFF", "-DUSE_OPENGLES=ON", "-DCMAKE_BUILD_TYPE=$elfBuildType"
                  abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-                 //abiFilters 'arm64-v8a'
             }
         }
     }
@@ -34,9 +30,17 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.debug
         }
     }
-    applicationVariants.all { variant ->
+    buildFeatures {
+        buildConfig = true
+    }
+    namespace 'com.dishii.mm'
+    lint {
+        abortOnError false
+    }
+    applicationVariants.configureEach { variant ->
         tasks["merge${variant.name.capitalize()}Assets"]
             .dependsOn("externalNativeBuild${variant.name.capitalize()}")
     }
@@ -45,26 +49,20 @@ android {
             jniLibs.srcDir 'libs'
         }
         externalNativeBuild {
-            //ndkBuild {
-            //    path 'jni/Android.mk'
-            //}
             cmake {
                  path '../../CMakeLists.txt'
-                 version "3.25.1"
+                 version "3.31.5"
             }
         }
        
     }
-    lintOptions {
-        abortOnError false
-    }
 
     if (buildAsLibrary) {
         libraryVariants.all { variant ->
             variant.outputs.each { output ->
                 def outputFile = output.outputFile
                 if (outputFile != null && outputFile.name.endsWith(".aar")) {
-                    def fileName = "org.libsdl.app.aar";
+                    def fileName = "com.dishii.mm.aar"
                     output.outputFile = new File(outputFile.parent, fileName);
                 }
             }
@@ -74,13 +72,13 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.core:core:1.7.0' // Use the latest version
-
+    implementation 'androidx.core:core:1.13.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
 }
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '7.3'
+tasks.register('wrapper', Wrapper) {
+    gradleVersion = '8.10.2'
 }
 
-task prepareKotlinBuildScriptModel {
+tasks.register('prepareKotlinBuildScriptModel') {
 }

Android/app/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

Android/app/src/main/AndroidManifest.xml

@@ -3,9 +3,8 @@
      com.gamemaker.game
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.dishii.mm"
-    android:versionCode="1"
-    android:versionName="1.0.0"
+    android:versionCode="4"
+    android:versionName="1.1.1"
     android:installLocation="auto">
 
     <!-- OpenGL ES 3.0 -->
@@ -54,8 +53,8 @@
     <!-- Allow access to the vibrator -->
     <uses-permission android:name="android.permission.VIBRATE" />
 
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
 
     <!-- if you want to capture audio, uncomment this. -->
     <!-- <uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
@@ -73,7 +72,8 @@
         android:allowBackup="true"
         android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
         android:hardwareAccelerated="true"
-        android:appCategory="game" >
+        android:appCategory="game"
+        android:requestLegacyExternalStorage="true">
 
 
         <!-- Example of setting SDL hints from AndroidManifest.xml:
@@ -84,7 +84,6 @@
 
      
         <activity android:name="MainActivity"
-            android:label="@string/app_name"
             android:alwaysRetainTaskState="true"
             android:launchMode="singleInstance"
             android:configChanges="layoutDirection|locale|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"

Android/app/src/main/assets/.gitignore

@@ -0,0 +1,3 @@
+# Extractor Assets Copied by CMake during buildtime
+assets/
+mods/

Android/app/src/main/assets/assets/extractor/Config_GC_US.xml

@@ -1,8 +0,0 @@
-<Root>
-    <SymbolMap File="symbols/SymbolMap_MM.txt"/>
-    <ActorList File="symbols/ActorList_MM.txt"/>
-    <ObjectList File="symbols/ObjectList_MM.txt"/>
-    <EnumData File="EnumData.xml"/>
-    <ExternalXMLFolder Path="assets/extractor/xmls/GC_US/"/>
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
-</Root>

Android/app/src/main/assets/assets/extractor/Config_N64_US.xml

@@ -1,8 +0,0 @@
-<Root>
-    <SymbolMap File="symbols/SymbolMap_MM.txt"/>
-    <ActorList File="symbols/ActorList_MM.txt"/>
-    <ObjectList File="symbols/ObjectList_MM.txt"/>
-    <EnumData File="EnumData.xml"/>
-    <ExternalXMLFolder Path="assets/extractor/xmls/N64_US/"/>
-    <ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="objects/gameplay_keep/"/>
-</Root>