Merge branch 'master' into wip-translator

.github/workflows/android-ci.yml

@@ -8,6 +8,10 @@ on:
       - devel
       - versus-ci-android
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 defaults:
   run:
     working-directory: Engine/android-project

.github/workflows/macos-ci.yml

@@ -10,6 +10,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: "${{ matrix.config.name }} | ${{ matrix.config.build_type }}"

.github/workflows/ubuntu-ci.yml

@@ -11,6 +11,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: "${{ matrix.config.name }} | ${{ matrix.config.build_type }}"
@@ -84,12 +88,9 @@ jobs:
         g++-8 --version
         cmake --version
 
-    - uses: actions/checkout@v3
-      with:
-        fetch-depth: 3
-        submodules: recursive
+    - uses: WohlSoft/[email protected]
 
-    - uses: Wohlstand/branch-name@v1.0.1-wohl
+    - uses: WohlSoft/branch-name@v0.1
 
     - name: Check if a pull request
       id: event-check
@@ -105,10 +106,8 @@ jobs:
 
     - name: Download Qt
       if: matrix.config.qt_download
-      uses: carlosperate/download-file-action@v2
-      with:
-        file-url: "${{ matrix.config.qt_download }}"
-        file-name: qt.tar.bz2
+      shell: bash
+      run: wget -d -nv -t 5 -O qt.tar.bz2 "${{ matrix.config.qt_download }}"
 
     - name: Extract Qt
       if: matrix.config.qt_install_dir
@@ -121,10 +120,8 @@ jobs:
 
     - name: Download libreadline6
       if: matrix.config.readline6_download
-      uses: carlosperate/download-file-action@v2
-      with:
-        file-url: "${{ matrix.config.readline6_download }}"
-        file-name: libreadline6.deb
+      shell: bash
+      run: wget -d -nv -t 5 -O libreadline6.deb "${{ matrix.config.readline6_download }}"
 
     - name: Install LFTP
       if: matrix.config.readline6_download
@@ -135,10 +132,8 @@ jobs:
 
     - name: Download LFTP
       if: matrix.config.lftp_download
-      uses: carlosperate/download-file-action@v2
-      with:
-        file-url: "${{ matrix.config.lftp_download }}"
-        file-name: lftp.deb
+      shell: bash
+      run: wget -d -nv -t 5 -O lftp.deb "${{ matrix.config.lftp_download }}"
 
     - name: Install LFTP
       if: matrix.config.lftp_download

.github/workflows/windows-ci.yml

@@ -10,6 +10,10 @@ on:
     branches:
       - master
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   build:
     name: "${{ matrix.config.name }} | ${{ matrix.config.build_type }}"

Engine/android-project/moondust/src/main/java/org/libsdl/app/SDLActivity.java

@@ -61,7 +61,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
     private static final String TAG = "SDL";
     private static final int SDL_MAJOR_VERSION = 2;
     private static final int SDL_MINOR_VERSION = 30;
-    private static final int SDL_MICRO_VERSION = 6;
+    private static final int SDL_MICRO_VERSION = 7;
 /*
     // Display InputType.SOURCE/CLASS of events and devices
     //