From 6330fc3bdc24e29a965d33c6dc16823bc4c3c7e9 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Thu, 29 Feb 2024 13:26:18 +0800
Subject: [PATCH] Revert "Build with Android 15 preview SDK"

This reverts commit 7d2e0f7f

Reason for revert: Android SDK sources for VanillaIceCream are not
available, making it hard to debug.
---
 .github/workflows/ci.yml       | 3 ---
 .github/workflows/releases.yml | 3 ---
 app/build.gradle.kts           | 3 +--
 gradle.properties              | 2 --
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3da6a9df5..4fc7c06cf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -80,9 +80,6 @@ jobs:
           key: cmake-default-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
           restore-keys: cmake-default-
 
-      - name: Install Build Tools
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "build-tools;35.0.0-rc1"
-
       - name: Build OSS
         run: ./gradlew assembleDefaultOssRelease
 
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
index 6936b16bc..4942c986e 100644
--- a/.github/workflows/releases.yml
+++ b/.github/workflows/releases.yml
@@ -36,9 +36,6 @@ jobs:
           key: ${{ runner.os }}-cmake-${{ hashFiles('gradle/libs.versions.toml', 'app/build.gradle.kts', 'app/src/main/cpp/CMakeLists.txt') }}
           restore-keys: ${{ runner.os }}-cmake-
 
-      - name: Install Build Tools
-        run: echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --install "build-tools;35.0.0-rc1"
-
       - name: Gradle Build
         uses: gradle/actions/setup-gradle@v3
         with:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 77cf1983e..9f7f6c41f 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -19,8 +19,7 @@ plugins {
 }
 
 android {
-    compileSdkPreview = "VanillaIceCream"
-    buildToolsVersion = "35.0.0-rc1"
+    compileSdk = 34
     ndkVersion = "26.2.11394342"
 
     splits {
diff --git a/gradle.properties b/gradle.properties
index c24c1f5bf..f5bcb2e19 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,5 +22,3 @@ org.gradle.configuration-cache=true
 android.useAndroidX=true
 android.enableAppCompileTimeRClass=true
 android.experimental.enableNewResourceShrinker.preciseShrinking=true
-android.injected.testOnly=false
-android.suppressUnsupportedCompileSdk=VanillaIceCream