Feature/corsixth 0.70 modernization

.github/workflows/android-ci.yml

@@ -9,28 +9,18 @@ on:
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
+    # Runner GAMING labels: self-hosted, Windows, X64
+    runs-on: [self-hosted, Windows, X64]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'true'
-    - name: set up JDK 18
-      uses: actions/setup-java@v3
+    - name: set up JDK 17
+      uses: actions/setup-java@v5
       with:
-        java-version: '18'
+        java-version: '17'
         distribution: 'temurin'
-        cache: gradle
-    - name: Decode Google Services Info
-      uses: timheuer/[email protected]
-      with:
-        fileName: 'google-services.json'
-        fileDir: '.'
-        encodedString: ${{ secrets.GOOGLE_SERVICES_JSON }}
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build App bundle
-      run: ./gradlew bundleRelease
-    - name: Build APKS
-      run: ./gradlew assembleRelease
+    - name: Build debug APK (community-safe)
+      shell: powershell
+      run: .\gradlew.bat createGameZip assembleCommunityDebug --no-daemon

.github/workflows/build_and_sign.yml

@@ -8,19 +8,18 @@ on:
 
 jobs:
   build:
-
-    runs-on: ubuntu-latest
+    # Runner GAMING labels: self-hosted, Windows, X64
+    runs-on: [self-hosted, Windows, X64]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: 'true'
-    - name: set up JDK 18
-      uses: actions/setup-java@v3
+    - name: set up JDK 17
+      uses: actions/setup-java@v5
       with:
-        java-version: '18'
+        java-version: '17'
         distribution: 'temurin'
-        cache: gradle
 
     - name: Decode Keystore
       id: decode_keystore
@@ -35,48 +34,48 @@ jobs:
         fileDir: '.'
         encodedString: ${{ secrets.GOOGLE_SERVICES_JSON }}
     - name: Set snapshot
-      run: |
-        echo "IS_SNAPSHOT=true" >> "$GITHUB_ENV"
       if: github.ref == 'refs/heads/dev'
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
+      shell: powershell
+      run: |
+        "IS_SNAPSHOT=true" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
     - name: Build APK and app bundle
-      run: ./gradlew bundleRelease assembleRelease
+      shell: powershell
+      run: .\gradlew.bat bundlePlaystoreRelease assemblePlaystoreRelease --no-daemon
       env:
         RELEASE_STORE_FILE: ${{ steps.decode_keystore.outputs.filePath }}
-        RELEASE_STORE_PASSWORD : ${{ secrets.RELEASE_STORE_PASSWORD }}
-        RELEASE_KEY_ALIAS : ${{ secrets.RELEASE_KEY_ALIAS }}
-        RELEASE_KEY_PASSWORD : ${{ secrets.RELEASE_KEY_PASSWORD }}
+        RELEASE_STORE_PASSWORD: ${{ secrets.RELEASE_STORE_PASSWORD }}
+        RELEASE_KEY_ALIAS: ${{ secrets.RELEASE_KEY_ALIAS }}
+        RELEASE_KEY_PASSWORD: ${{ secrets.RELEASE_KEY_PASSWORD }}
         BUILD_NUMBER: ${{ github.run_number }}
     - name: Upload crashlytics symbols
-      run: ./gradlew uploadCrashlyticsSymbolFileRelease
+      shell: powershell
+      run: .\gradlew.bat uploadCrashlyticsSymbolFilePlaystoreRelease --no-daemon
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v3.1.2
+      uses: actions/upload-artifact@v4
       with:
         name: AppBundle
-        path: build/outputs/bundle/release/*
+        path: build/outputs/bundle/playstoreRelease/*
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v3.1.2
+      uses: actions/upload-artifact@v4
       with:
         name: APK
-        path: build/outputs/apk/release/*
+        path: build/outputs/apk/playstore/release/*
     - name: Set version variables
+      shell: powershell
       run: |
-        VER=$(cat version.txt)
-        echo "VERSION=$VER" >> $GITHUB_ENV
+        $ver = (Get-Content version.txt -Raw).Trim()
+        "VERSION=$ver" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
     - name: Create/Update Github Snapshot Release
-      uses: mini-bomba/create-github-release@v1.1.3
+      uses: softprops/action-gh-release@v2
       if: github.ref == 'refs/heads/dev'
       with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        tag: ${{ env.VERSION }}
-        body: 'Snapshot release'
-        files: |
-          build/outputs/apk/release/*.apk
-          README.md
-        clear_attachments: true
-        prerelease: true
+        tag_name: ${{ env.VERSION }}
         name: ${{ env.VERSION }}
+        prerelease: true
+        body: 'Snapshot release (self-hosted GAMING)'
+        files: build/outputs/apk/release/*.apk
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     - name: Publish Snapshot to Play Store
       uses: swootte/[email protected]
       if: github.ref == 'refs/heads/dev'

.github/workflows/pre-release.yml

@@ -0,0 +1,147 @@
+# Pre-release APK on the self-hosted GAMING runner (Windows / X64).
+name: Pre-release APK
+
+on:
+  push:
+    tags:
+      - 'v*-pre-release'
+      - 'v*-pre-release-*'
+  workflow_dispatch:
+    inputs:
+      build_version:
+        description: 'BUILD_VERSION / release name (e.g. 0.70.1-pre-release-2)'
+        required: true
+        default: '0.70.1-pre-release-2'
+
+permissions:
+  contents: write
+
+jobs:
+  build-and-release:
+    # Labels on runner GAMING: self-hosted, Windows, X64
+    runs-on: [self-hosted, Windows, X64]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v5
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Resolve Android SDK (self-hosted)
+        shell: powershell
+        run: |
+          $sdk = $env:ANDROID_HOME
+          if ([string]::IsNullOrWhiteSpace($sdk)) { $sdk = $env:ANDROID_SDK_ROOT }
+          if ([string]::IsNullOrWhiteSpace($sdk)) {
+            $candidates = @(
+              "$env:LOCALAPPDATA\Android\Sdk",
+              "$env:USERPROFILE\AppData\Local\Android\Sdk",
+              "E:\000-lastBeacon_ia\android-sdk",
+              "C:\Android\Sdk",
+              "E:\Android\Sdk"
+            )
+            foreach ($c in $candidates) {
+              if ((Test-Path "$c\platform-tools") -or (Test-Path "$c\platforms")) {
+                $sdk = $c
+                break
+              }
+            }
+          }
+          if ([string]::IsNullOrWhiteSpace($sdk) -or -not (Test-Path $sdk)) {
+            throw "Android SDK not found. Set ANDROID_HOME on the GAMING runner."
+          }
+          "ANDROID_HOME=$sdk" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          "ANDROID_SDK_ROOT=$sdk" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          # local.properties uses escaped backslashes (Gradle Properties format).
+          $escaped = ($sdk -replace '\\', '/')
+          "sdk.dir=$escaped" | Set-Content -Path local.properties -Encoding ascii
+          Write-Host "ANDROID_HOME=$sdk"
+
+      - name: Resolve version
+        shell: powershell
+        run: |
+          $ver = "${{ github.event.inputs.build_version }}"
+          if ([string]::IsNullOrWhiteSpace($ver)) {
+            $tag = "${{ github.ref_name }}"
+            if ($tag.StartsWith("v")) {
+              $ver = $tag.Substring(1)
+            } elseif ("${{ github.event_name }}" -eq "workflow_dispatch") {
+              $ver = "0.70.1-pre-release-2"
+            } else {
+              $ver = $tag
+            }
+          }
+          $runNumber = [int]"${{ github.run_number }}"
+          $buildNumber = 1000000 + $runNumber
+          "BUILD_VERSION=$ver" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          "RELEASE_TAG=v$ver" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          "BUILD_NUMBER=$buildNumber" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          Write-Host "BUILD_VERSION=$ver BUILD_NUMBER=$buildNumber"
+
+      - name: Build release APK (short path)
+        shell: powershell
+        run: |
+          # Windows ndk-build hits CreateProcess error 87 when the link line is too
+          # long under GithubActions_Runner\_work\... Copy into a short real path.
+          $short = "C:\cth-pr"
+          if (Test-Path $short) { Remove-Item -Recurse -Force $short }
+          New-Item -ItemType Directory -Path $short | Out-Null
+          robocopy "$env:GITHUB_WORKSPACE" $short /E /NFL /NDL /NJH /NJS /nc /ns /np
+          # robocopy exit codes 0-7 are success/partial
+          if ($LASTEXITCODE -ge 8) { throw "robocopy failed with code $LASTEXITCODE" }
+          "SHORT_WORKSPACE=$short" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
+          Set-Location $short
+          # Refresh local.properties for the copied tree
+          $sdk = $env:ANDROID_HOME
+          "sdk.dir=$($sdk -replace '\\','/')" | Set-Content -Path local.properties -Encoding ascii
+          .\gradlew.bat createGameZip assembleCommunityRelease --no-daemon
+        env:
+          BUILD_VERSION: ${{ env.BUILD_VERSION }}
+          IS_SNAPSHOT: 'false'
+          # Set in "Resolve version" (1000000 + run_number) above SNAPSHOT default.
+          BUILD_NUMBER: ${{ env.BUILD_NUMBER }}
+
+      - name: Stage APK artifact
+        shell: powershell
+        run: |
+          $root = if ($env:SHORT_WORKSPACE) { $env:SHORT_WORKSPACE } else { $env:GITHUB_WORKSPACE }
+          Set-Location $root
+          New-Item -ItemType Directory -Force -Path distribution/pre-release | Out-Null
+          $src = Get-ChildItem -Recurse build/outputs/apk/community/release/*.apk | Select-Object -First 1
+          if (-not $src) {
+            $src = Get-ChildItem -Recurse build/outputs/apk/**/release/*.apk | Select-Object -First 1
+          }
+          if (-not $src) { throw "No release APK found" }
+          $dest = "distribution/pre-release/CorsixTH-Android-$($env:BUILD_VERSION).apk"
+          Copy-Item $src.FullName $dest -Force
+          Write-Host "Staged $dest ($($src.Length) bytes)"
+
+      - name: Upload APK artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: CorsixTH-Android-${{ env.BUILD_VERSION }}
+          path: |
+            distribution/pre-release/CorsixTH-Android-${{ env.BUILD_VERSION }}.apk
+            distribution/pre-release/0.70.1-pre-release.md
+
+      - name: Publish / update GitHub pre-release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ env.RELEASE_TAG }}
+          name: ${{ env.BUILD_VERSION }}
+          prerelease: true
+          generate_release_notes: false
+          body_path: distribution/pre-release/0.70.1-pre-release.md
+          files: |
+            distribution/pre-release/CorsixTH-Android-${{ env.BUILD_VERSION }}.apk
+            distribution/pre-release/0.70.1-pre-release.md
+          fail_on_unmatched_files: false
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "jni/CorsixTH"]
 	path = jni/CorsixTH
-	url = https://github.com/alanwoolley/CorsixTH.git
-	branch = Android
+	url = https://github.com/thomasbonsirven/CorsixTH-android-0.70.1.git
+	branch = feature/android-phase4-0.70.1

AndroidManifest.xml

@@ -9,15 +9,35 @@
         android:smallScreens="false"
         android:xlargeScreens="true" />
 
+    <!-- Explicit network permissions (demo download / optional reporting). -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <!-- No broad READ/WRITE_EXTERNAL_STORAGE — Theme Hospital import uses SAF. -->
     <uses-permission android:name="com.google.android.gms.permission.AD_ID" tools:node="remove" />
 
+    <!-- Package visibility (Android 11+): privacy policy / external https viewers. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="https" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.VIEW" />
+            <data android:scheme="http" />
+        </intent>
+    </queries>
+
     <application
         android:name="uk.co.armedpineapple.cth.CTHApplication"
+        android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
+        android:pageSizeCompat="enabled"
         android:theme="@style/Theme.AppTheme"
-        android:gwpAsanMode="always"
-        tools:targetApi="r">
+        tools:targetApi="36">
 
         <meta-data android:name="com.google.android.gms.games.APP_ID"
             android:value="@string/app_id"/>
@@ -33,6 +53,11 @@
             android:name="SDL_ENV.SDL_TOUCH_MOUSE_EVENTS"
             android:value="false" />
 
+        <!-- Trap Android back into SDL as AC Back (mapped to Escape in Lua) instead of finishing. -->
+        <meta-data
+            android:name="SDL_ENV.SDL_ANDROID_TRAP_BACK_BUTTON"
+            android:value="true" />
+
         <!-- Don't enable crashlytics or analytics collection by default. Opt-in is used instead. -->
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
@@ -56,11 +81,11 @@
             android:name="uk.co.armedpineapple.cth.GameActivity"
             android:configChanges="layoutDirection|locale|orientation|uiMode|screenLayout|screenSize|smallestScreenSize|keyboard|keyboardHidden|navigation"
             android:exported="true"
-            android:immersive="true"
             android:launchMode="singleInstance"
             android:preferMinimalPostProcessing="true"
             android:theme="@style/Theme.AppCompat.NoActionBar"
-            tools:targetApi="r">
+            android:windowSoftInputMode="adjustResize"
+            tools:targetApi="36">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -70,18 +95,21 @@
         <activity
             android:name="uk.co.armedpineapple.cth.setup.SetupActivity"
             android:excludeFromRecents="true"
-            android:exported="false" />
+            android:exported="false"
+            android:enableOnBackInvokedCallback="true" />
 
         <activity
             android:name="uk.co.armedpineapple.cth.settings.SettingsActivity"
             android:excludeFromRecents="true"
             android:exported="false"
+            android:enableOnBackInvokedCallback="true"
             android:label="@string/title_activity_settings"
             android:theme="@style/Theme.SettingsTheme" />
 
         <activity
             android:name="uk.co.armedpineapple.cth.files.SaveActivity"
             android:exported="false"
+            android:enableOnBackInvokedCallback="true"
             android:label="@string/save"
             android:theme="@style/Theme.SaveTheme" />