Merge branch 'kivy:develop' into sdlsurface-patch

Author: kengoon

.github/workflows/push.yml

@@ -19,9 +19,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout python-for-android
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Set up Python 3.x
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: 3.x
     - name: Run flake8
@@ -35,16 +35,18 @@ jobs:
     needs: flake8
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
-        os: [ubuntu-latest, macOs-latest]
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14', '3.14t']
+        os: [ubuntu-latest, macos-latest]
     steps:
     - name: Checkout python-for-android
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
+        allow-prereleases: true
     - name: Tox tests
       run: |
         python -m pip install --upgrade pip
@@ -78,7 +80,7 @@ jobs:
             target: testapps-qt
     steps:
     - name: Checkout python-for-android
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Build python-for-android docker image
       run: |
         docker build --tag=kivy/python-for-android .
@@ -114,9 +116,9 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        # macos-latest (ATM macos-14) runs on Apple Silicon,
-        # macos-13 runs on Intel
-        runs_on: ['macos-latest', 'macos-13']
+        # macos-latest (ATM macos-15) runs on Apple Silicon,
+        # macos-15-intel runs on Intel
+        runs_on: ['macos-latest', 'macos-15-intel']
         bootstrap:
           - name: sdl2
             target: testapps-with-numpy
@@ -129,14 +131,14 @@ jobs:
       ANDROID_NDK_HOME: ${HOME}/.android/android-ndk
     steps:
       - name: Checkout python-for-android
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set up Python 3.x
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.x
       - name: Install python-for-android
         run: |
-          python3 -m pip install -e .
+          python3 -m pip install --editable .
       - name: Install prerequisites via pythonforandroid/prerequisites.py (Experimental)
         run: |
           python3 pythonforandroid/prerequisites.py
@@ -162,6 +164,26 @@ jobs:
           name: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-artifacts
           path: dist
 
+  test_on_emulator:
+    name: Run App on Emulator
+    needs: ubuntu_build
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v5
+      - name: Download Artifacts
+        uses: actions/download-artifact@v5
+        with:
+          name: ubuntu-latest-sdl2-artifacts
+          path: dist/
+
+      - name: Setup and start Android Emulator
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 30
+          arch: x86_64
+          script: ci/run_emulator_tests.sh
+
   ubuntu_rebuild_updated_recipes:
     name: Test updated recipes for arch ${{ matrix.android_arch }} [ ubuntu-latest ]
     needs: [flake8]
@@ -174,7 +196,7 @@ jobs:
       REBUILD_UPDATED_RECIPES_EXTRA_ARGS: --arch=${{ matrix.android_arch }}
     steps:
     - name: Checkout python-for-android (all-history)
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
     # helps with GitHub runner getting out of space
@@ -201,9 +223,9 @@ jobs:
     strategy:
       matrix:
         android_arch: ["arm64-v8a", "armeabi-v7a", "x86_64", "x86"]
-        # macos-latest (ATM macos-14) runs on Apple Silicon,
-        # macos-13 runs on Intel
-        runs_on: ['macos-latest', 'macos-13']
+        # macos-latest (ATM macos-15) runs on Apple Silicon,
+        # macos-15-intel runs on Intel
+        runs_on: ['macos-latest', 'macos-15-intel']
     env:
       ANDROID_HOME: ${HOME}/.android
       ANDROID_SDK_ROOT: ${HOME}/.android/android-sdk
@@ -212,16 +234,16 @@ jobs:
       REBUILD_UPDATED_RECIPES_EXTRA_ARGS: --arch=${{ matrix.android_arch }}
     steps:
       - name: Checkout python-for-android (all-history)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Set up Python 3.x
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: 3.x
       - name: Install python-for-android
         run: |
-          python3 -m pip install -e .
+          python3 -m pip install --editable .
       - name: Install prerequisites via pythonforandroid/prerequisites.py (Experimental)
         run: |
           python3 pythonforandroid/prerequisites.py
@@ -244,7 +266,7 @@ jobs:
   documentation:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Requirements
       run: |
         python -m pip install --upgrade pip

.github/workflows/pypi-release.yml

@@ -19,7 +19,7 @@ jobs:
         twine check dist/*
     - name: Publish package
       if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
-      uses: pypa/gh-action-pypi-publish@v1.4.2
+      uses: pypa/gh-action-pypi-publish@v1.13.0
       with:
         user: __token__
         password: ${{ secrets.pypi_password }}

ci/constants.py

@@ -25,8 +25,9 @@ class TargetPython(Enum):
     # mpmath package with a version >= 0.19 required
     'sympy',
     'vlc',
-    # need extra gfortran NDK system add-on
-    'lapack', 'scipy',
+    # GitHub CI runs out of storage while building it
+    'scipy',
+    'fortran',
     # Outdated and there's a chance that is now useless.
     'zope_interface',
     # Requires zope_interface, which is broken.

ci/makefiles/android.mk

@@ -1,12 +1,12 @@
 # Downloads and installs the Android SDK depending on supplied platform: darwin or linux
 
 # Those android NDK/SDK variables can be override when running the file
-ANDROID_NDK_VERSION ?= 25b
+ANDROID_NDK_VERSION ?= 28c
 ANDROID_NDK_VERSION_LEGACY ?= 21e
 ANDROID_SDK_TOOLS_VERSION ?= 6514223
 ANDROID_SDK_BUILD_TOOLS_VERSION ?= 29.0.3
 ANDROID_HOME ?= $(HOME)/.android
-ANDROID_API_LEVEL ?= 27
+ANDROID_API_LEVEL ?= 36
 
 # per OS dictionary-like
 UNAME_S := $(shell uname -s)

ci/run_emulator_tests.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+set -euxo pipefail
+
+# Find the built APK file
+APK_FILE=$(find dist -name "*.apk" -print -quit)
+
+if [ -z "$APK_FILE" ]; then
+    echo "Error: No APK file found in dist/"
+    exit 1
+fi
+
+echo "Installing $APK_FILE..."
+adb install "$APK_FILE"
+
+# Extract package and activity names
+AAPT2_PATH=$(find ${ANDROID_HOME}/build-tools/ -name aapt2 | sort -r | head -n 1)
+APP_PACKAGE=$(${AAPT2_PATH} dump badging "${APK_FILE}" | awk -F"'" '/package: name=/{print $2}')
+APP_ACTIVITY=$(${AAPT2_PATH} dump badging "${APK_FILE}" | awk -F"'" '/launchable-activity/ {print $2}')
+
+echo "Launching $APP_PACKAGE/$APP_ACTIVITY..."
+adb shell am start -n "$APP_PACKAGE/$APP_ACTIVITY" -a android.intent.action.MAIN -c android.intent.category.LAUNCHER
+
+# Poll for test completion with timeout
+MAX_WAIT=300
+POLL_INTERVAL=5
+elapsed=0
+
+echo "Waiting for tests to complete (max ${MAX_WAIT}s)..."
+
+while [ $elapsed -lt $MAX_WAIT ]; do
+    # Dump current logs
+    adb logcat -d -s python:I *:S > app_logs.txt
+
+    # Check if all success patterns are present
+    if grep --extended-regexp --quiet "I python[ ]+: Initialized python" app_logs.txt && \
+       grep --extended-regexp --quiet "I python[ ]+: Ran 14 tests in" app_logs.txt && \
+       grep --extended-regexp --quiet "I python[ ]+: OK" app_logs.txt; then
+        echo "✅ SUCCESS: App launched and all unit tests passed in ${elapsed}s."
+        exit 0
+    fi
+
+    # Check for early failure indicators
+    if grep --extended-regexp --quiet "I python[ ]+: FAILED" app_logs.txt; then
+        echo "❌ FAILURE: Tests failed after ${elapsed}s."
+        echo "--- Full Logs ---"
+        cat app_logs.txt
+        echo "-----------------"
+        exit 1
+    fi
+
+    sleep $POLL_INTERVAL
+    elapsed=$((elapsed + POLL_INTERVAL))
+    echo "Still waiting... (${elapsed}s elapsed)"
+done
+
+echo "❌ TIMEOUT: Tests did not complete within ${MAX_WAIT}s."
+echo "--- Full Logs ---"
+cat app_logs.txt
+echo "-----------------"
+exit 1

doc/source/quickstart.rst

@@ -119,7 +119,7 @@ named ``tools``, and you will need to run extra commands to install
 the SDK packages needed. 
 
 For Android NDK, note that modern releases will only work on a 64-bit
-operating system. **The minimal, and recommended, NDK version to use is r25b:**
+operating system. **The minimal, and recommended, NDK version to use is r28c:**
 
  - `Go to ndk downloads page <https://developer.android.com/ndk/downloads/>`_
  - Windows users should create a virtual machine with an GNU Linux os
@@ -154,7 +154,7 @@ variables necessary for building on android::
     # Adjust the paths!
     export ANDROIDSDK="$HOME/Documents/android-sdk-27"
     export ANDROIDNDK="$HOME/Documents/android-ndk-r23b"
-    export ANDROIDAPI="27"  # Target API version of your application
+    export ANDROIDAPI="36"  # Target API version of your application
     export NDKAPI="21"  # Minimum supported API version of your application
     export ANDROIDNDKVER="r10e"  # Version of the NDK you installed
 

doc/source/testing_pull_requests.rst

@@ -118,7 +118,7 @@ Using python-for-android commands directly from the pull request files
         --requirements=sdl2,pyjnius,kivy,python3,pycryptodome \
         --ndk-dir=/media/DEVEL/Android/android-ndk-r20 \
         --sdk-dir=/media/DEVEL/Android/android-sdk-linux \
-        --android-api=27 \
+        --android-api=36 \
         --arch=arm64-v8a \
         --permission=VIBRATE \
         --debug
@@ -175,7 +175,7 @@ Installing python-for-android using the github's branch of the pull request
     python3 setup.py apk \
         --ndk-dir=/media/DEVEL/Android/android-ndk-r20 \
         --sdk-dir=/media/DEVEL/Android/android-sdk-linux \
-        --android-api=27 \
+        --android-api=36 \
         --arch=arm64-v8a \
         --debug
 

pythonforandroid/archs.py

@@ -132,10 +132,7 @@ def get_env(self, with_flags_in_cc=True):
         env['CPPFLAGS'] = ' '.join(self.common_cppflags).format(
             ctx=self.ctx,
             command_prefix=self.command_prefix,
-            python_includes=join(
-                self.ctx.get_python_install_dir(self.arch),
-                'include/python{}'.format(self.ctx.python_recipe.version[0:3]),
-            ),
+            python_includes=join(Recipe.get_recipe("python3", self.ctx).include_root(self.arch))
         )
 
         # LDFLAGS: Link the extra global link paths first before anything else

pythonforandroid/bootstraps/common/build/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip