From bab3fc1a70214da82b6f05316964bf07f71ee6a6 Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 25 Oct 2021 16:20:45 +0200
Subject: [PATCH] fix CI

---
 .gitlab-ci.yml | 22 ++++------------------
 build.gradle   |  2 +-
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48795d9..5543116 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,9 @@
-image: java:8-jdk
-
-variables:
-  ANDROID_COMPILE_SDK: "30"
-  ANDROID_BUILD_TOOLS: "30.0.3"
-  ANDROID_SDK_TOOLS: "4333796"
+image: hatsoftwares/mastalab-ci:latest
 
 before_script:
-  - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS}.zip
-  - unzip -d android-sdk-linux android-sdk.zip
-  - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null
-  - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null
-  - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null
-  - export ANDROID_HOME=$PWD/android-sdk-linux
-  - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/
-  - chmod +x ./gradlew
-  # temporarily disable checking for EPIPE error and use yes to accept all licenses
-  - set +o pipefail
-  - yes | android-sdk-linux/tools/bin/sdkmanager --licenses
-  - set -o pipefail
+  - export ANDROID_HOME=/opt/android-sdk-linux
+  - export PATH=$PATH:/opt/android-sdk-linux/platform-tools/
+  - chmod +x gradlew
 
 stages:
   - build-and-test
diff --git a/build.gradle b/build.gradle
index 0970460..f7d726a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files