update CHANGELOG

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Added gradle 6.2 to `turtle-android-base`
+- Added `ANDROID_NDK_HOME` in `turtle-android-base`
+
 ## [0.17.2] - 2020-08-06
 
 ### Changed

Dockerfile

@@ -1,5 +1,5 @@
 # see docker-base/Dockerfile to learn what's installed in the turtle-android-base image
-FROM gcr.io/exponentjs/turtle-android-base:0.4.0
+FROM gcr.io/exponentjs/turtle-android-base:0.5.0
 
 ADD . /app/turtle
 

docker-base/Dockerfile

@@ -57,10 +57,23 @@ ENV PATH ${ANDROID_HOME}/build-tools/28.0.3/:${PATH}
 
 ADD configureAndroidSdk.sh /tmp/configureAndroidSdk.sh
 RUN /tmp/configureAndroidSdk.sh --install-all-platforms
+ENV ANDROID_NDK_HOME /usr/local/android-sdk-linux/ndk/17.2.4988734
 
 # Support Gradle
 ENV TERM dumb
 
+# Install gradle 6.2
+RUN wget https://services.gradle.org/distributions/gradle-6.2-all.zip
+RUN unzip -qq gradle-6.2-all.zip
+RUN cp -r gradle-6.2 /usr/local
+
+RUN mkdir -p /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj
+RUN mv gradle-6.2-all.zip /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj
+RUN mv gradle-6.2 /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj
+RUN touch /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj/gradle-6.2-all.zip.ok
+RUN touch /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj/gradle-6.2-all.zip.lck
+RUN chmod 755 /root/.gradle/wrapper/dists/gradle-6.2-all/dvufqs6kielxeao781pmk5huj/gradle-6.2/bin/gradle
+
 # Install gradle 5.6.3
 RUN wget https://services.gradle.org/distributions/gradle-5.6.3-all.zip
 RUN unzip -qq gradle-5.6.3-all.zip