From a5b6266a6d4e3b4feb28dfbfca6eb383f1eff888 Mon Sep 17 00:00:00 2001
From: Duncan Tourolle <duncan@tourolle.paris>
Date: Sun, 21 Jun 2026 10:48:26 +0200
Subject: [PATCH] Permanent CI fix

---
 .gitea/workflows/build-and-test.yml | 10 ----------
 Dockerfile.builder                  | 11 ++++++++---
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.gitea/workflows/build-and-test.yml b/.gitea/workflows/build-and-test.yml
index 38233ec..a72dcc7 100644
--- a/.gitea/workflows/build-and-test.yml
+++ b/.gitea/workflows/build-and-test.yml
@@ -103,16 +103,6 @@ jobs:
       - name: Build frontend
         run: bun run build
 
-      - name: Ensure Android SDK packages & licenses
-        run: |
-          SDKMANAGER="$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager"
-          # Accept all SDK licenses (required before Gradle can auto-install components)
-          yes | "$SDKMANAGER" --sdk_root="$ANDROID_HOME" --licenses
-          # Install the build-tools / platform the Gradle build needs
-          yes | "$SDKMANAGER" --sdk_root="$ANDROID_HOME" \
-            "platforms;android-36" \
-            "build-tools;35.0.0"
-
       - name: Ensure Android NDK
         run: |
           if [ ! -d "$NDK_HOME" ]; then
diff --git a/Dockerfile.builder b/Dockerfile.builder
index fb0b590..ee2b285 100644
--- a/Dockerfile.builder
+++ b/Dockerfile.builder
@@ -7,7 +7,8 @@ FROM ubuntu:24.04
 ENV DEBIAN_FRONTEND=noninteractive \
     ANDROID_HOME=/opt/android-sdk \
     NDK_VERSION=27.0.11902837 \
-    SDK_VERSION=34 \
+    SDK_VERSION=36 \
+    BUILD_TOOLS_VERSION=35.0.0 \
     RUST_BACKTRACE=1 \
     PATH="/root/.bun/bin:/root/.cargo/bin:$PATH" \
     CARGO_HOME=/root/.cargo
@@ -68,10 +69,14 @@ RUN wget -q https://dl.google.com/android/repository/commandlinetools-linux-1107
     mkdir -p $ANDROID_HOME/cmdline-tools/latest && \
     mv $ANDROID_HOME/cmdline-tools/* $ANDROID_HOME/cmdline-tools/latest/ 2>/dev/null || true
 
-# Install Android SDK components
+# Accept all SDK licenses up front so Gradle can install/use components non-interactively
+RUN yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --licenses > /dev/null
+
+# Install Android SDK components (must match the compileSdk/targetSdk in the generated Gradle project)
 RUN $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME \
+    "platform-tools" \
     "platforms;android-$SDK_VERSION" \
-    "build-tools;34.0.0" \
+    "build-tools;$BUILD_TOOLS_VERSION" \
     "ndk;$NDK_VERSION" \
     --channel=0 2>&1 | grep -v "Warning" || true