From 20d41d5480d1494c38d531c466d0561da694473b Mon Sep 17 00:00:00 2001
From: Stefan Schueller <sschueller@nunight.com>
Date: Fri, 1 Oct 2021 18:29:03 +0200
Subject: [PATCH] fix: android update

---
 Dockerfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8f7dca0..4eac765 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,7 @@ FROM gradle:7-jdk16
 # get link at bottom of https://developer.android.com/studio
 ENV ANDROID_SDK_URL https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip
 ENV ANDROID_SDK_CHECKSUM 124f2d5115eee365df6cf3228ffbca6fc3911d16f8025bebd5b1c6e2fcfa7faf
-# https://developer.android.com/studio/releases/platform-tools
-ENV ANDROID_BUILD_TOOLS_VERSION 29.0.6
+ENV ANDROID_BUILD_TOOLS_VERSION 29.0.3
 ENV ANDROID_HOME /usr/local/android-sdk-linux
 ENV ANDROID_VERSION 29
 ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
@@ -14,11 +13,14 @@ RUN mkdir "$ANDROID_HOME" .android && \
     curl -o sdk.zip $ANDROID_SDK_URL && \
     echo "${ANDROID_SDK_CHECKSUM}  sdk.zip" | sha256sum -c - && \
     unzip sdk.zip && \
-    rm sdk.zip
+    rm sdk.zip && \
+    mv cmdline-tools tools && \
+    mkdir cmdline-tools && \
+    mv tools cmdline-tools/.
 
-RUN yes | ${ANDROID_HOME}/cmdline-tools/bin/sdkmanager --licenses
-RUN $ANDROID_HOME/cmdline-tools/bin/sdkmanager --update
-RUN $ANDROID_HOME/cmdline-tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
+RUN yes | ${ANDROID_HOME}/tools/bin/sdkmanager --licenses
+RUN $ANDROID_HOME/tools/bin/sdkmanager --update
+RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
     "platforms;android-${ANDROID_VERSION}" \
     "platform-tools"