Merge branch 'master' into build-tools-30.0.2

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## UPCOMING
 
+## `v2020_09_30_1`
+
+* Java 11 preinstalled
+
 ## `v2020_09_22_1`
 
 * new preinstalled package: `build-tools-30.0.2`

Dockerfile

@@ -7,16 +7,24 @@ ENV ANDROID_HOME /opt/android-sdk-linux
 # ------------------------------------------------------
 # --- Install required tools
 
-RUN apt-get update -qq
+RUN add-apt-repository ppa:openjdk-r/ppa
+RUN dpkg --add-architecture i386
 
 # Base (non android specific) tools
 # -> should be added to bitriseio/docker-bitrise-base
 
 # Dependencies to execute Android builds
-RUN dpkg --add-architecture i386
 RUN apt-get update -qq
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y openjdk-8-jdk libc6:i386 libstdc++6:i386 libgcc1:i386 libncurses5:i386 libz1:i386 net-tools
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y openjdk-8-jdk openjdk-11-jdk libc6:i386 libstdc++6:i386 libgcc1:i386 libncurses5:i386 libz1:i386 net-tools
+
+# Keystore format has changed since JAVA 8 https://bugs.launchpad.net/ubuntu/+source/openjdk-9/+bug/1743139
+RUN mv /etc/ssl/certs/java/cacerts /etc/ssl/certs/java/cacerts.old \
+    && keytool -importkeystore -destkeystore /etc/ssl/certs/java/cacerts -deststoretype jks -deststorepass changeit -srckeystore /etc/ssl/certs/java/cacerts.old -srcstoretype pkcs12 -srcstorepass changeit \
+    && rm /etc/ssl/certs/java/cacerts.old
 
+# Select JAVA 8  as default
+RUN sudo update-java-alternatives --jre-headless --set java-1.8.0-openjdk-amd64
+RUN sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
 
 # ------------------------------------------------------
 # --- Download Android Command line Tools into $ANDROID_SDK_ROOT
@@ -40,7 +48,7 @@ ENV PATH ${PATH}:${ANDROID_SDK_ROOT}/platform-tools:${ANDROID_SDK_ROOT}/cmdline-
 # Accept licenses before installing components, no need to echo y for each component
 # License is valid for all the standard components in versions installed from this file
 # Non-standard components: MIPS system images, preview versions, GDK (Google Glass) and Android Google TV require separate licenses, not accepted there
-RUN yes | sdkmanager  --licenses
+RUN yes | sdkmanager --licenses
 
 RUN touch /root/.android/repositories.cfg
 
@@ -127,6 +135,10 @@ RUN apt-get purge maven maven2 \
  && apt-get -y install maven \
  && mvn --version
 
+# Reselect JAVA 8  as default
+RUN sudo update-java-alternatives --jre-headless --set java-1.8.0-openjdk-amd64
+RUN sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac
+ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
 
 # ------------------------------------------------------
 # --- Pre-install Ionic and Cordova CLIs

Dockerfile-pinned

@@ -3,6 +3,6 @@
 # is pre-cached on https://www.bitrise.io/ Linux/Android Virtual Machines.
 # Read more about how versions are handled in the README.md
 
-FROM quay.io/bitriseio/android:alpha-v2020_09_17-02_22-b2251
+FROM quay.io/bitriseio/android:alpha-v2020_10_01-02_22-b2274
 
 CMD bitrise --version

system_report.sh

@@ -33,6 +33,15 @@ fi
 echo "========================================"
 echo
 
+echo "=== Java ==============================="
+
+echo "* JAVA_HOME: $JAVA_HOME"
+ver_line="$( java -version 2>&1  | head -n 1)" ;          echo "* Java: $ver_line"
+ver_line="$( javac -version 2>&1  | head -n 1)" ;         echo "* Javac: $ver_line"
+
+echo "========================================"
+echo
+
 echo
 echo "=== Google Cloud SDK components ========"
 if [[ ! -z "$BITRISE_DOCKER_REV_NUMBER_ANDROID_NDK_LTS" ]] ; then