From 0bc553fbe4193b11a62ccbb2bb9492ad55c1671b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Behmo?= <regis@behmo.com>
Date: Wed, 3 Oct 2018 15:44:02 +0200
Subject: [PATCH] Accelerate Android app build

App building is accelerated by pre-installing packages in docker image.
---
 CHANGELOG.md       |  1 +
 android/Dockerfile | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec147b2..b6d4f73 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+- 2018-10-03 [Improvement/Bugfix] Fix and accelerate Android application build
 - 2018-10-02 [Improvement] Bump Open edX version to hawthorn.2
 - 2018-09-30 [Bugfix] Fix CMS celery worker, including export tasks
 - 2018-09-30 [Improvement] Simplify boolean feature flags definition
diff --git a/android/Dockerfile b/android/Dockerfile
index 54c5a51..33d674f 100644
--- a/android/Dockerfile
+++ b/android/Dockerfile
@@ -17,17 +17,21 @@ RUN wget https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_
     unzip sdk-tools-linux-${ANDROID_SDK_VERSION}.zip && \
     rm sdk-tools-linux-${ANDROID_SDK_VERSION}.zip
 
+# Accept licenses
+RUN yes | /openedx/android-sdk/tools/bin/sdkmanager --licenses
+
 # Install android app repo
 RUN git clone https://github.com/edx/edx-app-android /openedx/edx-app-android
 WORKDIR /openedx/edx-app-android
 
+# Install gradle and all dependencies
+RUN ./gradlew -v
+RUN ./gradlew tasks
+
 # User-customized config
 COPY ./edx.properties ./OpenEdXMobile/edx.properties
 RUN mkdir /openedx/config
 RUN ln -s /openedx/config/gradle.properties ./OpenEdXMobile/gradle.properties
 
-# Accept licenses
-RUN yes | /openedx/android-sdk/tools/bin/sdkmanager --licenses
-
 CMD ./gradlew assembleProdDebuggable && \
   cp OpenEdXMobile/build/outputs/apk/prod/debuggable/*.apk /openedx/data/