Merge branch 'master' of https://github.com/pionere/devilutionX into android

Author: pionere

.github/workflows/cmake.yml

@@ -13,10 +13,10 @@ jobs:
     # well on Windows or Mac.  You can convert this to a matrix build if you need
     # cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: ubuntu-22.04
-    steps:
-    - name: Install gettext
-      run: sudo apt-get update && sudo apt-get install -y gettext
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Install gettext
+      run: sudo apt-get update && sudo apt-get install -y gettext
 
     - name: Checkout
       uses: actions/checkout@v4
@@ -50,10 +50,10 @@ jobs:
     - name: Build
       working-directory: ${{github.workspace}}
       shell: bash
-      run: cd android-project && ./gradlew assembleRelease -Pcmakearg0="-DHELLFIRE=ON" -Pcmakearg1="" -Pcmakearg2=""
-
-    - name: Upload-Package
-      uses: actions/upload-artifact@v3
+      run: cd android-project && ./gradlew assembleRelease -Pcmakearg0="-DHELLFIRE=ON" -Pcmakearg1="" -Pcmakearg2=""
+
+    - name: Upload-Package
+      uses: actions/upload-artifact@v4
       with:
         #name: devilutionx-debug.apk
         #path: android-project/app/build/outputs/apk/debug/app-debug.apk