AaronFiore/electrum
1
0
Fork 0
Code Activity

android: update kivy, p4a, buildozer

Browse Source
This commit is contained in:
SomberNight
2019-06-07 20:06:15 +02:00
parent 6bdc6f559c
commit 5c83df7709
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
electrum/gui/kivy/tools/Dockerfile
View File

@@ -127,6 +127,8 @@ USER ${USER}
RUN python3 -m pip install --upgrade cython==0.28.6 RUN python3 -m pip install --upgrade cython==0.28.6
RUN python3 -m pip install --upgrade pip
RUN python3 -m pip install --user wheel
# prepare git # prepare git
RUN git config --global user.name "John Doe" \ RUN git config --global user.name "John Doe" \
@@ -136,8 +138,8 @@ RUN git config --global user.name "John Doe" \
RUN cd /opt \ RUN cd /opt \
&& git clone https://github.com/kivy/buildozer \ && git clone https://github.com/kivy/buildozer \
&& cd buildozer \ && cd buildozer \
&& git checkout 88e4a4b0c7733eec1d14c00579ec412fb59ad7f2 \ && git checkout 678b1bf52cf63daa51b06e86a43ea4e2ea8a0b24 \
&& python3 -m pip install -e . && python3 -m pip install --user -e .
# install python-for-android # install python-for-android
RUN cd /opt \ RUN cd /opt \
@@ -145,12 +147,12 @@ RUN cd /opt \
&& cd python-for-android \ && cd python-for-android \
&& git remote add sombernight https://github.com/SomberNight/python-for-android \ && git remote add sombernight https://github.com/SomberNight/python-for-android \
&& git fetch --all \ && git fetch --all \
&& git checkout dec1badc3bd134a9a1c69275339423a95d63413e \ && git checkout ccb0f8e1bab36f1b7d1508216b4b4afb076e614f \
# allowBackup="false": # allowBackup="false":
&& git cherry-pick d7f722e4e5d4b3e6f5b1733c95e6a433f78ee570 \ && git cherry-pick d7f722e4e5d4b3e6f5b1733c95e6a433f78ee570 \
# enable IPv6: # fix gradle "versionCode" overflow:
&& git cherry-pick a607f4a446773ac0b0a5150171092b0617fbe670 \ && git cherry-pick ed20e196fbcdce718a180f88f23bb2d165c4c5d8 \
&& python3 -m pip install -e . && python3 -m pip install --user -e .
# build env vars # build env vars
ENV USE_SDK_WRAPPER=1 ENV USE_SDK_WRAPPER=1

14
electrum/gui/kivy/tools/buildozer.spec
View File

@@ -35,7 +35,14 @@ version.filename = %(source.dir)s/electrum/version.py
#version = 1.9.8 #version = 1.9.8
# (list) Application requirements # (list) Application requirements
requirements = python3, android, openssl, plyer, kivy==b47f669f44dbda4f463bcb7d2cada639f7fed3bc, libffi, libsecp256k1 requirements =
python3,
android,
openssl,
plyer,
kivy==82d561d62577757d478df52173610f925c05ecab,
libffi,
libsecp256k1
# (str) Presplash of the application # (str) Presplash of the application
#presplash.filename = %(source.dir)s/gui/kivy/theming/splash.png #presplash.filename = %(source.dir)s/gui/kivy/theming/splash.png
@@ -64,11 +71,8 @@ android.api = 28
# (int) Minimum API required. You will need to set the android.ndk_api to be as low as this value. # (int) Minimum API required. You will need to set the android.ndk_api to be as low as this value.
android.minapi = 21 android.minapi = 21
# (int) Android SDK version to use
android.sdk = 24
# (str) Android NDK version to use # (str) Android NDK version to use
android.ndk = 14b android.ndk = 17c
# (int) Android NDK API to use (optional). This is the minimum API your app will support. # (int) Android NDK API to use (optional). This is the minimum API your app will support.
android.ndk_api = 21 android.ndk_api = 21