From 9936c79fa3cf11d54da9d30dc5019d52ae064cb7 Mon Sep 17 00:00:00 2001 From: Richard Tibbles Date: Tue, 19 Apr 2022 16:06:20 -0700 Subject: [PATCH 1/2] Update P4A version. --- Makefile | 4 ++-- requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 08437d2e..236af873 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ kolibri.apk: p4a_android_distro src/kolibri needs-version @echo "--- :android: Build APK" p4a apk --release --sign --arch=$(P4A_ARCH) --version=$(APK_VERSION) --numeric-version=$(BUILD_NUMBER) mkdir -p dist - mv kolibri__$(P4A_ARCH)-$(APK_VERSION)-.apk dist/kolibri__$(P4A_ARCH)-$(APK_VERSION).apk + mv kolibri-$(APK_VERSION)-.apk dist/kolibri__$(ARM_VER)-$(APK_VERSION).apk .PHONY: kolibri.apk.unsigned # Build the unsigned debug version of the apk @@ -95,7 +95,7 @@ kolibri.apk.unsigned: p4a_android_distro src/kolibri needs-version @echo "--- :android: Build APK (unsigned)" p4a apk --arch=$(P4A_ARCH) --version=$(APK_VERSION) --numeric-version=$(BUILD_NUMBER) mkdir -p dist - mv kolibri__$(P4A_ARCH)-debug-$(APK_VERSION)-.apk dist/kolibri__$(P4A_ARCH)-debug-$(APK_VERSION).apk + mv kolibri-debug-$(APK_VERSION)-.apk dist/kolibri__$(ARM_VER)-debug-$(APK_VERSION).apk # DOCKER BUILD diff --git a/requirements.txt b/requirements.txt index cd4a7931..073d21e3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ cython virtualenv -git+https://github.com/learningequality/python-for-android@350d7158a0a35f578a95d50de969101579bbdc4f#egg=python-for-android +git+https://github.com/learningequality/python-for-android@b0ad42809044635c31c7b421093ac546d5e0812d#egg=python-for-android From 7ea2ef93cefd3283fbd7e31d57310b4b0d26294e Mon Sep 17 00:00:00 2001 From: Richard Tibbles Date: Wed, 20 Apr 2022 11:33:52 -0700 Subject: [PATCH 2/2] Update P4A again and get proper release name. Co-authored-by: Dan Nicholson --- Makefile | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 236af873..d7349246 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ kolibri.apk: p4a_android_distro src/kolibri needs-version @echo "--- :android: Build APK" p4a apk --release --sign --arch=$(P4A_ARCH) --version=$(APK_VERSION) --numeric-version=$(BUILD_NUMBER) mkdir -p dist - mv kolibri-$(APK_VERSION)-.apk dist/kolibri__$(ARM_VER)-$(APK_VERSION).apk + mv kolibri-release-$(APK_VERSION)-.apk dist/kolibri__$(ARM_VER)-$(APK_VERSION).apk .PHONY: kolibri.apk.unsigned # Build the unsigned debug version of the apk diff --git a/requirements.txt b/requirements.txt index 073d21e3..7e4b02f0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,3 @@ cython virtualenv -git+https://github.com/learningequality/python-for-android@b0ad42809044635c31c7b421093ac546d5e0812d#egg=python-for-android +git+https://github.com/learningequality/python-for-android@999271bab4450daf21fc4fd7ef2fe915be9cca1b#egg=python-for-android