From 6028c817963aa5d51eda5017ed1984d9fb4dccd6 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Mon, 27 Jun 2022 09:43:15 -0500
Subject: [PATCH] ci: Bump versions of tools and sdks for Android

---
 .gitlab-ci.yml                    | 2 +-
 .gitlab-ci/config.yml             | 2 +-
 .gitlab-ci/install-android-sdk.sh | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dcbc6a123..6ec0652a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ include:
 .monado.variables.debian:bullseye-ndk:
   variables:
     FDO_DISTRIBUTION_VERSION: "bullseye"
-    FDO_DISTRIBUTION_TAG: "2022-03-16.0"
+    FDO_DISTRIBUTION_TAG: "2022-06-27.0"
     FDO_REPO_SUFFIX: ndk
 
 # Variables for build and usage of Ubuntu focal image
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 2f6219b10..46749b46b 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -115,7 +115,7 @@ distributions:
         distro_version: bullseye
         repo_suffix: ndk
         script: android_container_prep.sh
-        tag: "2022-03-16.0"
+        tag: "2022-06-27.0"
         packages:
           git:
           wget:
diff --git a/.gitlab-ci/install-android-sdk.sh b/.gitlab-ci/install-android-sdk.sh
index 9d4cdee9d..2c61bbc56 100755
--- a/.gitlab-ci/install-android-sdk.sh
+++ b/.gitlab-ci/install-android-sdk.sh
@@ -5,10 +5,10 @@
 # Partially inspired by https://about.gitlab.com/blog/2018/10/24/setting-up-gitlab-ci-for-android-projects/
 
 set -eo pipefail
-VERSION=7583922
+VERSION=8512546
 ROOT=${ROOT:-/opt/android-sdk}
-ANDROID_COMPILE_SDK=${ANDROID_COMPILE_SDK:-30}
-ANDROID_BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-30.0.3}
+ANDROID_COMPILE_SDK=${ANDROID_COMPILE_SDK:-31}
+ANDROID_BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-31.0.0}
 
 mkdir -p "$ROOT"
 FN=commandlinetools-linux-${VERSION}_latest.zip