From 52685204ffe3b8187ae52c20120d497fb857130c Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas@schildbach.de>
Date: Thu, 25 Aug 2022 10:49:46 +0200
Subject: [PATCH] .gitlab-ci.yml: migrate to free sdkmanager for installing SDK
 packages

---
 .gitlab-ci.yml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f88f3eb..3eb36e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,18 @@
 image: ubuntu:jammy
 
 variables:
-  GIT_SUBMODULE_STRATEGY:   recursive
-  ANDROID_HOME:             $PWD/android-sdk
-  ANDROID_SDK_TOOLS:        8512546_latest
-  ANDROID_SDK_LICENSE_HASH: 24333f8a63b6825ea9c5514f83c2829b004d1fee
+  GIT_SUBMODULE_STRATEGY:         recursive
+  ANDROID_PLATFORM_VERSION_OEFFI: android-31
+  ANDROID_BUILD_TOOLS_VERSION:    33.0.0
+  ANDROID_HOME:                   $PWD/android-sdk
 
 before_script:
   - apt-get update
   - apt-get -y upgrade
   - apt-get -y install ${JDK_PACKAGE}
-  - apt-get -y install wget gradle
-  - wget --quiet --output-document=commandlinetools-linux.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_SDK_TOOLS}.zip
-  - mkdir -p ${ANDROID_HOME}
-  - unzip -d ${ANDROID_HOME} commandlinetools-linux.zip
-  - mkdir -p ${ANDROID_HOME}/licenses
-  - echo -e "\n${ANDROID_SDK_LICENSE_HASH}" >> ${ANDROID_HOME}/licenses/android-sdk-license
+  - apt-get -y install sdkmanager gradle
+  - yes | sdkmanager --licenses >/dev/null || true
+  - sdkmanager --install "platforms;$ANDROID_PLATFORM_VERSION_OEFFI" "build-tools;$ANDROID_BUILD_TOOLS_VERSION"
 
 build:
   parallel: