From eb36691641ed5662fddce44ef4dcf74657b0c1a2 Mon Sep 17 00:00:00 2001
From: Henrique Melo <49417222+MeloHenrique@users.noreply.github.com>
Date: Thu, 5 Aug 2021 21:29:14 +0100
Subject: [PATCH] Update .gitpod.dockerfile

Updated paths and versions.
---
 .gitpod.dockerfile | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitpod.dockerfile b/.gitpod.dockerfile
index 8471b5c..8ceec96 100644
--- a/.gitpod.dockerfile
+++ b/.gitpod.dockerfile
@@ -14,20 +14,23 @@ USER gitpod
 # Android
 ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
 ENV ANDROID_HOME="/home/gitpod/.android"
-ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip"
+ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip"
 ENV ANDROID_SDK_ARCHIVE="${ANDROID_HOME}/archive"
 ENV ANDROID_STUDIO_PATH="/home/gitpod/"
 
 RUN cd "${ANDROID_STUDIO_PATH}"
-RUN wget -qO android_studio.zip https://dl.google.com/dl/android/studio/ide-zips/3.3.0.20/android-studio-ide-182.5199772-linux.zip
-RUN unzip android_studio.zip
-RUN rm -f android_studio.zip
+RUN wget -qO android-studio-2020.3.1.22-linux.tar.gz https://r3---sn-apn7en7l.gvt1.com/edgedl/android/studio/ide-zips/2020.3.1.22/android-studio-2020.3.1.22-linux.tar.gz
+RUN tar -xf android-studio-2020.3.1.22-linux.tar.gz
+RUN rm -f android-studio-2020.3.1.22-linux.tar.gz
 
 RUN mkdir -p "${ANDROID_HOME}"
 RUN touch $ANDROID_HOME/repositories.cfg
 RUN wget -q "${ANDROID_SDK_URL}" -O "${ANDROID_SDK_ARCHIVE}"
 RUN unzip -q -d "${ANDROID_HOME}" "${ANDROID_SDK_ARCHIVE}"
-RUN echo y | "${ANDROID_HOME}/tools/bin/sdkmanager" "platform-tools" "platforms;android-28" "build-tools;28.0.3"
+RUN mv "${ANDROID_HOME}/cmdline-tools" "${ANDROID_HOME}/cmdline-tools-temp"
+RUN mkdir -p "${ANDROID_HOME}/cmdline-tools/latest"
+RUN cp -r "${ANDROID_HOME}/cmdline-tools-temp/." "${ANDROID_HOME}/cmdline-tools/latest"
+RUN echo y | "${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager" "platform-tools" "platforms;android-28" "build-tools;28.0.3"
 RUN rm "${ANDROID_SDK_ARCHIVE}"
 
 # Flutter
@@ -37,7 +40,7 @@ RUN $FLUTTER_HOME/bin/flutter channel master
 RUN $FLUTTER_HOME/bin/flutter upgrade
 RUN $FLUTTER_HOME/bin/flutter precache
 RUN $FLUTTER_HOME/bin/flutter config --enable-web --no-analytics
-RUN yes "y" | $FLUTTER_HOME/bin/flutter doctor --android-licenses -v
+RUN yes | "${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager"
 ENV PUB_CACHE=/workspace/.pub_cache
 
 # Env