Merge branch 'develop' into patch-1

Author: cclauss

.github/workflows/push.yml

@@ -8,6 +8,10 @@ env:
   AAR_ARTIFACT_FILENAME: bdist_unit_tests_app-release-1.1.aar
   PYTHONFORANDROID_PREREQUISITES_INSTALL_INTERACTIVE: 0
 
+concurrency:
+  group: build-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
 
   flake8:
@@ -100,7 +104,7 @@ jobs:
         if [ -f dist/${{ env.AAB_ARTIFACT_FILENAME }} ]; then mv dist/${{ env.AAB_ARTIFACT_FILENAME }} dist/${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.AAB_ARTIFACT_FILENAME }}; fi
         if [ -f dist/${{ env.AAR_ARTIFACT_FILENAME }} ]; then mv dist/${{ env.AAR_ARTIFACT_FILENAME }} dist/${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.AAR_ARTIFACT_FILENAME }}; fi
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-artifacts
         path: dist
@@ -155,7 +159,7 @@ jobs:
           if [ -f dist/${{ env.APK_ARTIFACT_FILENAME }} ]; then mv dist/${{ env.APK_ARTIFACT_FILENAME }} dist/${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.APK_ARTIFACT_FILENAME }}; fi
           if [ -f dist/${{ env.AAB_ARTIFACT_FILENAME }} ]; then mv dist/${{ env.AAB_ARTIFACT_FILENAME }} dist/${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-${{ env.AAB_ARTIFACT_FILENAME }}; fi
       - name: Upload artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.runs_on }}-${{ matrix.bootstrap.name }}-artifacts
           path: dist
@@ -182,7 +186,7 @@ jobs:
         sudo swapoff -a
         sudo rm -f /swapfile
         sudo apt -y clean
-        docker rmi $(docker image ls -aq)
+        docker images -q | xargs -r docker rmi
         df -h
     - name: Pull docker image
       run: |

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2010-2023 Kivy Team and other contributors
+Copyright (c) 2010-2025 Kivy Team and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

ci/constants.py

@@ -33,8 +33,6 @@ class TargetPython(Enum):
     'twisted',
     # genericndkbuild is incompatible with sdl2 (which is build by default when targeting sdl2 bootstrap)
     'genericndkbuild',
-    # libmysqlclient gives a linker failure (See issue #2808)
-    'libmysqlclient',
     # boost gives errors (requires numpy? syntax error in .jam?)
     'boost',
     # libtorrent gives errors (requires boost. Also, see issue #2809, to start with)

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)

doc/source/quickstart.rst

@@ -57,7 +57,7 @@ You can also test the master branch from Github using::
     pip install git+https://github.com/kivy/python-for-android.git
 
 Installing Prerequisites
-~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 p4a requires a few dependencies to be installed on your system to work
 properly. While we're working on a way to automate pre-requisites checks,
@@ -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/recipes.rst

@@ -54,10 +54,29 @@ omitted if the source is somehow loaded from elsewhere.
 You must include ``recipe = YourRecipe()``. This variable is accessed
 when the recipe is imported.
 
+Specifying the URL
+------------------
+
 .. note:: The url includes the ``{version}`` tag. You should only
           access the url with the ``versioned_url`` property, which
           replaces this with the version attribute.
 
+.. note:: you may need to specify additional headers to allow python-for-android
+          to download the archive. Specify your additional headers by setting the
+          download_headers property.
+
+For example, when downloading from a private github repository, you can specify the following:
+
+(For the download_headers property in your recipe)
+```
+[('Authorization', 'token <your personal access token>'), ('Accept', 'application/vnd.github+json')]
+```
+
+(For the DOWNLOAD_HEADERS_my-package-name environment variable - specify as a JSON formatted set of values)
+.. code-block:: bash
+
+    [["Authorization","token <your personal access token>"],["Accept", "application/vnd.github+json"]]
+
 The actual build process takes place via three core methods::
 
       def prebuild_arch(self, arch):

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/bootstrap.py

@@ -14,6 +14,8 @@
     rmdir, move)
 from pythonforandroid.recipe import Recipe
 
+SDL_BOOTSTRAPS = ("sdl2", "sdl3")
+
 
 def copy_files(src_root, dest_root, override=True, symlink=False):
     for root, dirnames, filenames in walk(src_root):
@@ -39,7 +41,7 @@ def copy_files(src_root, dest_root, override=True, symlink=False):
 
 
 default_recipe_priorities = [
-    "webview", "sdl2", "service_only"  # last is highest
+    "webview", "sdl2", "sdl3", "service_only"  # last is highest
 ]
 # ^^ NOTE: these are just the default priorities if no special rules
 # apply (which you can find in the code below), so basically if no
@@ -150,18 +152,18 @@ def get_bootstrap_dirs(self):
         return bootstrap_dirs
 
     def _copy_in_final_files(self):
-        if self.name == "sdl2":
-            # Get the paths for copying SDL2's java source code:
-            sdl2_recipe = Recipe.get_recipe("sdl2", self.ctx)
-            sdl2_build_dir = sdl2_recipe.get_jni_dir()
-            src_dir = join(sdl2_build_dir, "SDL", "android-project",
+        if self.name in SDL_BOOTSTRAPS:
+            # Get the paths for copying SDL's java source code:
+            sdl_recipe = Recipe.get_recipe(self.name, self.ctx)
+            sdl_build_dir = sdl_recipe.get_jni_dir()
+            src_dir = join(sdl_build_dir, "SDL", "android-project",
                            "app", "src", "main", "java",
                            "org", "libsdl", "app")
             target_dir = join(self.dist_dir, 'src', 'main', 'java', 'org',
                               'libsdl', 'app')
 
             # Do actual copying:
-            info('Copying in SDL2 .java files from: ' + str(src_dir))
+            info('Copying in SDL .java files from: ' + str(src_dir))
             if not os.path.exists(target_dir):
                 os.makedirs(target_dir)
             copy_files(src_dir, target_dir, override=True)
@@ -193,7 +195,7 @@ def assemble_distribution(self):
     @classmethod
     def all_bootstraps(cls):
         '''Find all the available bootstraps and return them.'''
-        forbidden_dirs = ('__pycache__', 'common')
+        forbidden_dirs = ('__pycache__', 'common', '_sdl_common')
         bootstraps_dir = join(dirname(__file__), 'bootstraps')
         result = set()
         for name in listdir(bootstraps_dir):
@@ -272,6 +274,13 @@ def have_dependency_in_recipes(dep):
             info('Using sdl2 bootstrap since it is in dependencies')
             return cls.get_bootstrap("sdl2", ctx)
 
+        # Special rule: return SDL3 bootstrap if there's an sdl3 dep:
+        if (have_dependency_in_recipes("sdl3") and
+                "sdl3" in [b.name for b in acceptable_bootstraps]
+                ):
+            info('Using sdl3 bootstrap since it is in dependencies')
+            return cls.get_bootstrap("sdl3", ctx)
+
         # Special rule: return "webview" if we depend on common web recipe:
         for possible_web_dep in known_web_packages:
             if have_dependency_in_recipes(possible_web_dep):

pythonforandroid/bootstraps/_sdl_common/__init__.py

@@ -0,0 +1,49 @@
+from os.path import join
+
+import sh
+
+from pythonforandroid.toolchain import (
+    Bootstrap, shprint, current_directory, info, info_main)
+from pythonforandroid.util import ensure_dir, rmdir
+
+
+class SDLGradleBootstrap(Bootstrap):
+    name = "_sdl_common"
+
+    recipe_depends = []
+
+    def assemble_distribution(self):
+        info_main("# Creating Android project ({})".format(self.name))
+
+        rmdir(self.dist_dir)
+        info("Copying SDL/gradle build")
+        shprint(sh.cp, "-r", self.build_dir, self.dist_dir)
+
+        # either the build use environment variable (ANDROID_HOME)
+        # or the local.properties if exists
+        with current_directory(self.dist_dir):
+            with open('local.properties', 'w') as fileh:
+                fileh.write('sdk.dir={}'.format(self.ctx.sdk_dir))
+
+        with current_directory(self.dist_dir):
+            info("Copying Python distribution")
+
+            self.distribute_javaclasses(self.ctx.javaclass_dir,
+                                        dest_dir=join("src", "main", "java"))
+
+            for arch in self.ctx.archs:
+                python_bundle_dir = join(f'_python_bundle__{arch.arch}', '_python_bundle')
+                ensure_dir(python_bundle_dir)
+
+                self.distribute_libs(arch, [self.ctx.get_libs_dir(arch.arch)])
+                site_packages_dir = self.ctx.python_recipe.create_python_bundle(
+                    join(self.dist_dir, python_bundle_dir), arch)
+                if not self.ctx.with_debug_symbols:
+                    self.strip_libraries(arch)
+                self.fry_eggs(site_packages_dir)
+
+            if 'sqlite3' not in self.ctx.recipe_build_order:
+                with open('blacklist.txt', 'a') as fileh:
+                    fileh.write('\nsqlite3/*\nlib-dynload/_sqlite3.so\n')
+
+        super().assemble_distribution()