Update to newer (unreleased) Python for Android version.

Author: rtibbles

.p4a

@@ -5,7 +5,7 @@
 --dist_name "kolibri"
 --private "src"
 --requirements python3==3.9.13,hostpython3==3.9.13,android,pyjnius,genericndkbuild,sqlite3,cryptography,twisted,attrs,bcrypt,service_identity,pyasn1,pyasn1_modules,pyopenssl,openssl,six,kolibri,ifaddr
---android-api 33
+--android-api 35
 --minsdk 23
 --ndk-api 23
 --permission ACCESS_NETWORK_STATE

Makefile

@@ -17,8 +17,9 @@ else
 	PLATFORM := linux
 endif
 
-ANDROID_API := 33
-ANDROIDNDKVER := 25.2.9519653
+ANDROID_API := 35
+ANDROIDNDKVER := 28.2.13676358
+SDKMANAGER_VERSION := 13114758
 
 ifdef ANDROID_SDK_ROOT
 else
@@ -191,19 +192,19 @@ logcat:
 
 $(SDK)/cmdline-tools/latest/bin/sdkmanager:
 	@echo "Downloading Android SDK command line tools"
-	wget https://dl.google.com/android/repository/commandlinetools-$(PLATFORM)-9477386_latest.zip
+	wget https://dl.google.com/android/repository/commandlinetools-$(PLATFORM)-${SDKMANAGER_VERSION}_latest.zip
 	rm -rf cmdline-tools
-	unzip commandlinetools-$(PLATFORM)-9477386_latest.zip -d $(SDK)
+	unzip commandlinetools-$(PLATFORM)-${SDKMANAGER_VERSION}_latest.zip -d $(SDK)
 	mv $(SDK)/cmdline-tools $(SDK)/latest
 	mkdir -p $(SDK)/cmdline-tools
 	mv $(SDK)/latest $(SDK)/cmdline-tools/latest
-	rm commandlinetools-$(PLATFORM)-9477386_latest.zip
+	rm commandlinetools-$(PLATFORM)-${SDKMANAGER_VERSION}_latest.zip
 
 sdk: $(SDK)/cmdline-tools/latest/bin/sdkmanager
 	yes y | $(SDK)/cmdline-tools/latest/bin/sdkmanager "platform-tools"
 	yes y | $(SDK)/cmdline-tools/latest/bin/sdkmanager "platforms;android-$(ANDROID_API)"
 	yes y | $(SDK)/cmdline-tools/latest/bin/sdkmanager "system-images;android-$(ANDROID_API);default;x86_64"
-	yes y | $(SDK)/cmdline-tools/latest/bin/sdkmanager "build-tools;30.0.3"
+	yes y | $(SDK)/cmdline-tools/latest/bin/sdkmanager "build-tools;35.0.0"
 	yes y | $(SDK)/cmdline-tools/latest/bin/sdkmanager "ndk;$(ANDROIDNDKVER)"
 	ln -sfT ndk/$(ANDROIDNDKVER) $(SDK)/ndk-bundle
 	@echo "Accepting all licenses"

README.md

@@ -6,7 +6,7 @@ Wraps Kolibri in an android-compatibility layer. Relies on Python-For-Android to
 
 1. Setup a Python virtual environment in which to do development. The Kolibri developer documentation has a [How To guide for doing this with pyenv](https://kolibri-dev.readthedocs.io/en/develop/howtos/pyenv_virtualenv.html) but any Python virtualenv should work.
 
-2. Ensure you have all [necessary packages for Python for Android](https://python-for-android.readthedocs.io/en/latest/quickstart/#installing-dependencies). Ensure you install java version 1.11, `sudo apt install openjdk-11-jdk` ,  and set it as the default java version: `sudo update-alternatives --auto javac` and `sudo update-alternatives --auto java`.
+2. Ensure you have all [necessary packages for Python for Android](https://python-for-android.readthedocs.io/en/latest/quickstart/#installing-dependencies). Ensure you install java version 1.17, `sudo apt install openjdk-17-jdk` ,  and set it as the default java version: `sudo update-alternatives --auto javac` and `sudo update-alternatives --auto java`.
 
 3. The `make setup` command will install the Android SDK and Android NDK.
 

requirements.txt

@@ -2,7 +2,7 @@ cython~=0.29
 ifaddr
 virtualenv
 setuptools
-git+https://github.com/learningequality/python-for-android@60f3bf7d653d3e4e97d8371feaef221ffcdeb421#egg=python-for-android
+git+https://github.com/learningequality/python-for-android@632047c77661710e1ed19b110ef78402c4c64228#egg=python-for-android
 google-api-python-client==2.96.0
 google-auth==2.22.0
 google-auth-httplib2==0.1.0