From b6d149edab774e05ee3b98b9624f91de4d5626c5 Mon Sep 17 00:00:00 2001
From: Stefan Schueller <sschueller@nunight.com>
Date: Sun, 21 Nov 2021 21:02:12 +0100
Subject: [PATCH] fix: CI updates, android SDK version

---
 Dockerfile       | 24 ++++++++++++++----------
 app/build.gradle |  6 +++---
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f65401e..4f77dad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,24 +4,28 @@ FROM gradle:7-jdk16
 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 31.0.3
-ENV ANDROID_HOME /usr/local/android-sdk-linux
-ENV ANDROID_VERSION 31
-ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+ENV ANDROID_BUILD_TOOLS_VERSION 30.0.2 # higher version casues Warning: Failed to find package
+ENV ANDROID_SDK_ROOT /usr/local/android-sdk-linux
+ENV ANDROID_VERSION 30
+# ENV PATH ${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+ENV PATH ${PATH}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin:${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin
 
-RUN mkdir "$ANDROID_HOME" .android && \
-    cd "$ANDROID_HOME" && \
+RUN mkdir "$ANDROID_SDK_ROOT" .android && \
+    cd "$ANDROID_SDK_ROOT" && \
     curl -o sdk.zip $ANDROID_SDK_URL && \
     echo "${ANDROID_SDK_CHECKSUM}  sdk.zip" | sha256sum -c - && \
     unzip sdk.zip && \
-    rm sdk.zip && \
+    rm sdk.zip
+RUN cd "$ANDROID_SDK_ROOT" && \
     mv cmdline-tools latest && \
     mkdir cmdline-tools && \
     mv latest cmdline-tools/.
 
-RUN yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --licenses
-RUN $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --update
-RUN $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
+RUN yes | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --licenses
+RUN $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager --update
+# https://developer.android.com/studio/command-line/sdkmanager
+RUN $ANDROID_SDK_ROOT/cmdline-tools/latest/bin/sdkmanager \
+    "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
     "platforms;android-${ANDROID_VERSION}" \
     "platform-tools"
 
diff --git a/app/build.gradle b/app/build.gradle
index 54b67ca..7ddb367 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,13 +39,13 @@ else {
 apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "31.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
 
     defaultConfig {
         applicationId "net.schueller.peertube"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 30
         versionCode 1064
         versionName "1.6.0"
         buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'