From 5c36a901114cab5dcf542099581cd411cc422cf4 Mon Sep 17 00:00:00 2001 From: Filipe Marchesini Date: Sun, 13 Jul 2025 01:10:45 -0300 Subject: [PATCH 1/7] =?UTF-8?q?=F0=9F=94=A7=20build:=20upgrade=20Gradle=20?= =?UTF-8?q?wrapper=20to=20`8.14.3`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * `distributionUrl` now points to `gradle‑8.14.3‑all.zip` --- .../common/build/gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonforandroid/bootstraps/common/build/gradle/wrapper/gradle-wrapper.properties b/pythonforandroid/bootstraps/common/build/gradle/wrapper/gradle-wrapper.properties index 8f174bc31b..4a2223651a 100644 --- a/pythonforandroid/bootstraps/common/build/gradle/wrapper/gradle-wrapper.properties +++ b/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 From 254a9e23cc12d32fb8117c926ab789a75c858444 Mon Sep 17 00:00:00 2001 From: Filipe Marchesini Date: Sun, 13 Jul 2025 01:14:14 -0300 Subject: [PATCH 2/7] =?UTF-8?q?=F0=9F=94=A7=20build:=20bump=20AGP=20to=20`?= =?UTF-8?q?8.11.0`,=20replace=20`jcenter()`=20with=20`mavenCentral()`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bootstraps/common/build/templates/build.tmpl.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle b/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle index 750a435d99..370b3957f9 100644 --- a/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle +++ b/pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle @@ -2,17 +2,17 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.1' + classpath 'com.android.tools.build:gradle:8.11.0' } } allprojects { repositories { google() - jcenter() + mavenCentral() {%- for repo in args.gradle_repositories %} {{repo}} {%- endfor %} From c753655dceb678324cffddb4a8a6a209849f7fa7 Mon Sep 17 00:00:00 2001 From: Filipe Marchesini Date: Tue, 15 Jul 2025 14:16:21 -0300 Subject: [PATCH 3/7] Update `android-api` to 35 in `testapps/on_device_unit_tests/setup.py` --- testapps/on_device_unit_tests/setup.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testapps/on_device_unit_tests/setup.py b/testapps/on_device_unit_tests/setup.py index a63ca8bcb7..4d2019390c 100644 --- a/testapps/on_device_unit_tests/setup.py +++ b/testapps/on_device_unit_tests/setup.py @@ -42,7 +42,7 @@ 'requirements': 'sqlite3,libffi,openssl,pyjnius,kivy,python3,requests,urllib3,' 'chardet,idna', - 'android-api': 27, + 'android-api': 35, 'ndk-api': 24, 'dist-name': 'bdist_unit_tests_app', 'arch': 'armeabi-v7a', @@ -56,7 +56,7 @@ 'requirements': 'sqlite3,libffi,openssl,pyjnius,kivy,python3,requests,urllib3,' 'chardet,idna', - 'android-api': 27, + 'android-api': 35, 'ndk-api': 24, 'dist-name': 'bdist_unit_tests_app', 'arch': 'armeabi-v7a', @@ -68,7 +68,7 @@ 'aar': { 'requirements' : 'python3', - 'android-api': 27, + 'android-api': 35, 'ndk-api': 24, 'dist-name': 'bdist_unit_tests_app', 'arch': 'arm64-v8a', From 9c04802b9cf9b8e2ab6eb567f3b14a33fa44b768 Mon Sep 17 00:00:00 2001 From: Filipe Marchesini Date: Tue, 15 Jul 2025 14:21:07 -0300 Subject: [PATCH 4/7] Update target android.api to 35 in buildozer.spec --- testapps/on_device_unit_tests/buildozer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testapps/on_device_unit_tests/buildozer.spec b/testapps/on_device_unit_tests/buildozer.spec index b372d5faa5..17fca683f1 100644 --- a/testapps/on_device_unit_tests/buildozer.spec +++ b/testapps/on_device_unit_tests/buildozer.spec @@ -88,7 +88,7 @@ fullscreen = 0 #android.permissions = INTERNET # (int) Target Android API, should be as high as possible. -#android.api = 27 +android.api = 35 # (int) Minimum API your APK will support. #android.minapi = 21 From 6d61a98255061f77abc9f02dc098a48146a94132 Mon Sep 17 00:00:00 2001 From: Filipe Marchesini Date: Tue, 15 Jul 2025 14:23:36 -0300 Subject: [PATCH 5/7] Update `ANDROID_API_LEVEL` to 35 in `android.mk` --- ci/makefiles/android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/makefiles/android.mk b/ci/makefiles/android.mk index 2041a6ce76..f04ebcdc54 100644 --- a/ci/makefiles/android.mk +++ b/ci/makefiles/android.mk @@ -6,7 +6,7 @@ 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 ?= 35 # per OS dictionary-like UNAME_S := $(shell uname -s) From 87f5f344f0e7098bdca1730e4b79ce2170d31632 Mon Sep 17 00:00:00 2001 From: Filipe Marchesini Date: Wed, 16 Jul 2025 00:55:35 -0300 Subject: [PATCH 6/7] Set `APP_PLATFORM` in `Application.mk` to use `NDK_API` --- pythonforandroid/bootstraps/webview/build/jni/Application.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/pythonforandroid/bootstraps/webview/build/jni/Application.mk b/pythonforandroid/bootstraps/webview/build/jni/Application.mk index e79e378f94..15598537ca 100644 --- a/pythonforandroid/bootstraps/webview/build/jni/Application.mk +++ b/pythonforandroid/bootstraps/webview/build/jni/Application.mk @@ -5,3 +5,4 @@ # APP_ABI := armeabi armeabi-v7a x86 APP_ABI := $(ARCH) +APP_PLATFORM := $(NDK_API) From cced23639470b55828fb551acccfff9d19992c8b Mon Sep 17 00:00:00 2001 From: Filipe Marchesini Date: Wed, 16 Jul 2025 02:00:40 -0300 Subject: [PATCH 7/7] Add `Application.mk` with `APP_PLATFORM` for service_library bootstrap Hopefully [this](https://github.com/kivy/python-for-android/actions/runs/16309986846/job/46063689527?pr=3172) will pass --- .../bootstraps/service_library/build/jni/Application.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 pythonforandroid/bootstraps/service_library/build/jni/Application.mk diff --git a/pythonforandroid/bootstraps/service_library/build/jni/Application.mk b/pythonforandroid/bootstraps/service_library/build/jni/Application.mk new file mode 100644 index 0000000000..4a6c42929c --- /dev/null +++ b/pythonforandroid/bootstraps/service_library/build/jni/Application.mk @@ -0,0 +1 @@ +APP_PLATFORM := $(NDK_API)