Skip to content

Commit 846a109

Browse files
FilipeMarchSomberNight
authored andcommitted
Update Android Gradle Plugin to 8.11.0 and Gradle Wrapper to 8.14.3 + update default API target to 35 in tests (kivy#3172)
* 🔧 build: upgrade Gradle wrapper to `8.14.3` * `distributionUrl` now points to `gradle‑8.14.3‑all.zip` * 🔧 build: bump AGP to `8.11.0`, replace `jcenter()` with `mavenCentral()` * Update `android-api` to 35 in `testapps/on_device_unit_tests/setup.py` * Update target android.api to 35 in buildozer.spec * Update `ANDROID_API_LEVEL` to 35 in `android.mk` * Set `APP_PLATFORM` in `Application.mk` to use `NDK_API` * 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 * Define `APP_ABI` variable in `Application.mk` for arch targeting ----- cherry-pick of kivy@a8f2ca1 from kivy#3172 (minus the unit test changes, as they conflict) (plus qt6 equivalent change)
1 parent 5aef640 commit 846a109

File tree

6 files changed

+9
-5
lines changed

6 files changed

+9
-5
lines changed

ci/makefiles/android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ANDROID_NDK_VERSION_LEGACY ?= 21e
66
ANDROID_SDK_TOOLS_VERSION ?= 6514223
77
ANDROID_SDK_BUILD_TOOLS_VERSION ?= 29.0.3
88
ANDROID_HOME ?= $(HOME)/.android
9-
ANDROID_API_LEVEL ?= 27
9+
ANDROID_API_LEVEL ?= 35
1010

1111
# per OS dictionary-like
1212
UNAME_S := $(shell uname -s)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip

pythonforandroid/bootstraps/common/build/templates/build.tmpl.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
buildscript {
33
repositories {
44
google()
5-
jcenter()
5+
mavenCentral()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:8.1.1'
8+
classpath 'com.android.tools.build:gradle:8.11.0'
99
}
1010
}
1111

1212
allprojects {
1313
repositories {
1414
google()
15-
jcenter()
15+
mavenCentral()
1616
{%- for repo in args.gradle_repositories %}
1717
{{repo}}
1818
{%- endfor %}

pythonforandroid/bootstraps/qt6/build/jni/Application.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55

66
# APP_ABI := armeabi armeabi-v7a x86
77
APP_ABI := $(ARCH)
8+
APP_PLATFORM := $(NDK_API)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
APP_PLATFORM := $(NDK_API)
2+
APP_ABI := $(ARCH)

pythonforandroid/bootstraps/webview/build/jni/Application.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55

66
# APP_ABI := armeabi armeabi-v7a x86
77
APP_ABI := $(ARCH)
8+
APP_PLATFORM := $(NDK_API)

0 commit comments

Comments
 (0)