Merge pull request #31 from kivy-garden/feature/bump_versions

⬆️ Bumps dependencies versions

Author: AndreMiras

Makefile

@@ -20,14 +20,13 @@ SYSTEM_DEPENDENCIES= \
 	libsdl2-image-dev \
 	libsdl2-mixer-dev \
 	libsdl2-ttf-dev \
-	libpython3.6-dev \
+	libpython3.7-dev \
 	libpython$(PYTHON_VERSION)-dev \
 	libzbar-dev \
 	pkg-config \
-	python3.6 \
-	python3.6-dev \
 	python$(PYTHON_VERSION) \
 	python$(PYTHON_VERSION)-dev \
+	python$(PYTHON_VERSION)-venv \
 	tox \
 	virtualenv
 OS=$(shell lsb_release -si 2>/dev/null || uname)
@@ -46,7 +45,7 @@ ifeq ($(OS), Ubuntu)
 endif
 
 $(VIRTUAL_ENV):
-	virtualenv -p $(PYTHON_WITH_VERSION) $(VIRTUAL_ENV)
+	$(PYTHON_WITH_VERSION) -m venv $(VIRTUAL_ENV)
 	$(PIP) install Cython==0.28.6
 	$(PIP) install -r requirements.txt
 

buildozer.spec

@@ -38,11 +38,12 @@ version.filename = %(source.dir)s/kivy_garden/zbarcam/version.py
 # comma seperated e.g. requirements = sqlite3,kivy
 requirements =
     android,
-    kivy==1.11.1,
+    hostpython3==3.8.1,
+    Kivy==58e70b1,
     libiconv,
     libzbar,
-    Pillow==5.2.0,
-    python3,
+    Pillow==7.0.0,
+    python3==3.8.1,
     pyzbar==0.1.8,
     xcamera==2019.928
 
@@ -218,7 +219,7 @@ android.arch = armeabi-v7a
 #p4a.fork = kivy
 
 # (str) python-for-android branch to use, defaults to master
-p4a.branch = develop
+p4a.branch = v2020.04.29
 
 # (str) python-for-android git clone directory (if empty, it will be automatically cloned from github)
 #p4a.source_dir =

dockerfiles/Dockerfile-android

@@ -14,10 +14,6 @@ ENV USER="user"
 ENV HOME_DIR="/home/${USER}"
 ENV WORK_DIR="${HOME_DIR}" \
     PATH="${HOME_DIR}/.local/bin:${PATH}"
-ENV DOCKERFILES_VERSION="v20190902" \
-    DOCKERFILES_URL="https://raw.githubusercontent.com/AndreMiras/dockerfiles"
-ENV MAKEFILES_URL="${DOCKERFILES_URL}/${DOCKERFILES_VERSION}/buildozer_android"
-ENV BUILDOZER_VERSION="81c31c4"
 
 
 # configure locale
@@ -36,23 +32,24 @@ RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends
     cmake \
     curl \
     gettext \
+    git \
     libffi-dev \
     libltdl-dev \
-    libpython2.7-dev \
-    libpython3.6-dev \
+    libpython3.7-dev \
+    libssl-dev \
     libtool \
     make \
     openjdk-8-jdk \
     pkg-config \
-    python3.6 \
-    python3-setuptools \
+    python3.7 \
     python3-pip \
     python3-setuptools \
     python \
     sudo \
     unzip \
     xz-utils \
-    zip
+    zip \
+    zlib1g-dev
 
 # prepare non root env, with sudo access and no password
 RUN useradd --create-home --shell /bin/bash ${USER} && \
@@ -62,10 +59,8 @@ RUN useradd --create-home --shell /bin/bash ${USER} && \
 USER ${USER}
 WORKDIR ${WORK_DIR}
 
-# install buildozer & dependencies and enforces buildozer master until next release
-RUN curl --location --progress-bar ${MAKEFILES_URL}/buildozer.mk --output buildozer.mk && \
-    make -f buildozer.mk && \
-    pip3 install --upgrade https://github.com/kivy/buildozer/archive/${BUILDOZER_VERSION}.zip
+# install buildozer & dependencies
+RUN pip3 install --user --upgrade buildozer Cython==0.28.6
 
 COPY . ${WORK_DIR}
 # limits the amount of logs for Travis

requirements/requirements-base.txt

@@ -1,7 +1,7 @@
-Kivy==1.11.1
+Kivy==2.0.0rc2
 Kivy-Garden==0.1.4
-numpy==1.16.1
-opencv-python==4.1.1.26
-Pillow==5.2.0
+numpy==1.18.4
+opencv-python==4.2.0.34
+Pillow==7.0.0
 pyzbar==0.1.8
 xcamera==2019.928