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) 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 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 %} 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) 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) 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 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',