Merge branch 'kivy:develop' into firebase

Author: kengoon

.github/workflows/push.yml

@@ -110,7 +110,9 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        runs_on: [macos-latest, apple-silicon-m1]
+        # macos-latest (ATM macos-14) runs on Apple Silicon,
+        # macos-13 runs on Intel
+        runs_on: ['macos-latest', 'macos-13']
         bootstrap:
           - name: sdl2
             target: testapps-with-numpy
@@ -124,25 +126,21 @@ jobs:
     steps:
       - name: Checkout python-for-android
         uses: actions/checkout@v4
+      - name: Set up Python 3.x
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
       - name: Install python-for-android
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           python3 -m pip install -e .
       - name: Install prerequisites via pythonforandroid/prerequisites.py (Experimental)
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           python3 pythonforandroid/prerequisites.py
       - name: Install dependencies (Legacy)
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           make --file ci/makefiles/osx.mk
       - name: Build multi-arch apk Python 3 (armeabi-v7a, arm64-v8a, x86_64, x86)
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           make ${{ matrix.bootstrap.target }}
       - name: Copy produced artifacts into dist/ (*.apk, *.aab)
         run: |
@@ -199,7 +197,9 @@ jobs:
     strategy:
       matrix:
         android_arch: ["arm64-v8a", "armeabi-v7a", "x86_64", "x86"]
-        runs_on: [macos-latest, apple-silicon-m1]
+        # macos-latest (ATM macos-14) runs on Apple Silicon,
+        # macos-13 runs on Intel
+        runs_on: ['macos-latest', 'macos-13']
     env:
       ANDROID_HOME: ${HOME}/.android
       ANDROID_SDK_ROOT: ${HOME}/.android/android-sdk
@@ -211,25 +211,21 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
+      - name: Set up Python 3.x
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
       - name: Install python-for-android
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           python3 -m pip install -e .
       - name: Install prerequisites via pythonforandroid/prerequisites.py (Experimental)
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           python3 pythonforandroid/prerequisites.py
       - name: Install dependencies (Legacy)
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           make --file ci/makefiles/osx.mk
       - name: Rebuild updated recipes
         run: |
-          source ci/osx_ci.sh
-          arm64_set_path_and_python_version 3.9.7
           make rebuild_updated_recipes
 
   coveralls_finish:

Dockerfile

@@ -57,6 +57,7 @@ RUN ${RETRY} apt -y update -qq > /dev/null \
         ant \
         autoconf \
         automake \
+        autopoint \
         ccache \
         cmake \
         g++ \
@@ -70,6 +71,7 @@ RUN ${RETRY} apt -y update -qq > /dev/null \
         make \
         openjdk-17-jdk \
         patch \
+        patchelf \
         pkg-config \
         python3 \
         python3-dev \

Makefile

@@ -55,7 +55,7 @@ testapps-with-scipy/%: virtualenv
 	. $(ACTIVATE) && cd testapps/on_device_unit_tests/ && \
 	export LEGACY_NDK=$(ANDROID_NDK_HOME_LEGACY)  && \
     python setup.py $(ARTIFACT) --$(MODE) --sdk-dir $(ANDROID_SDK_HOME) --ndk-dir $(ANDROID_NDK_HOME) \
-    --requirements python3,scipy,kivy \
+			--requirements python3,scipy,kivy \
     --arch=armeabi-v7a --arch=arm64-v8a
 
 testapps-webview: testapps-webview/debug/apk testapps-webview/release/aab

ci/osx_ci.sh

@@ -72,6 +72,7 @@ the following command (re-adapted from the `Dockerfile` we use to perform CI bui
         ant \
         autoconf \
         automake \
+        autopoint \
         ccache \
         cmake \
         g++ \
@@ -85,6 +86,7 @@ the following command (re-adapted from the `Dockerfile` we use to perform CI bui
         make \
         openjdk-17-jdk \
         patch \
+        patchelf \
         pkg-config \
         python3 \
         python3-dev \