From ee21751e03aa59cfffee9329ab0960dbaa774eed Mon Sep 17 00:00:00 2001 From: Hermes Date: Mon, 31 Aug 2026 12:18:29 -0500 Subject: [PATCH] build: target Android 16 / API 36 --- .gitea/workflows/android-build.yml | 4 ++-- AndroidProjectTooling.sh | 18 +++++++++--------- app/build.gradle.kts | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/android-build.yml b/.gitea/workflows/android-build.yml index 7e15732..f06e496 100644 --- a/.gitea/workflows/android-build.yml +++ b/.gitea/workflows/android-build.yml @@ -50,8 +50,8 @@ jobs: set -o pipefail sdkmanager \ "platform-tools" \ - "platforms;android-35" \ - "build-tools;35.0.0" \ + "platforms;android-36" \ + "build-tools;36.0.0" \ "ndk;27.2.12479018" \ "cmake;3.22.1" diff --git a/AndroidProjectTooling.sh b/AndroidProjectTooling.sh index 673a701..04dce6e 100755 --- a/AndroidProjectTooling.sh +++ b/AndroidProjectTooling.sh @@ -30,8 +30,8 @@ GRADLE_DIST_URL="https://services.gradle.org/distributions/gradle-8.7-bin.zip" JDK_DIST_URL="https://api.adoptium.net/v3/binary/latest/17/ga/linux/x64/jdk/hotspot/normal/eclipse" ANDROID_NDK_PACKAGE="ndk;27.2.12479018" ANDROID_CMAKE_PACKAGE="cmake;3.22.1" -ANDROID_EMULATOR_SYSTEM_IMAGE="system-images;android-35;google_apis;x86_64" -ANDROID_TEST_AVD_NAME="githug_android_api35" +ANDROID_EMULATOR_SYSTEM_IMAGE="system-images;android-36;google_apis;x86_64" +ANDROID_TEST_AVD_NAME="githug_android_api36" ANDROID_NDK_DIR="$SDK_DIR/ndk/27.2.12479018" ANDROID_CMAKE_DIR="$SDK_DIR/cmake/3.22.1" ANDROID_TOOLBIN="$ANDROID_NDK_DIR/toolchains/llvm/prebuilt/linux-x86_64/bin" @@ -139,8 +139,8 @@ mark_successful_check() { required_sdk_packages_present() { [ -d "$SDK_DIR/platform-tools" ] \ - && [ -d "$SDK_DIR/platforms/android-35" ] \ - && [ -d "$SDK_DIR/build-tools/35.0.0" ] \ + && [ -d "$SDK_DIR/platforms/android-36" ] \ + && [ -d "$SDK_DIR/build-tools/36.0.0" ] \ && [ -d "$ANDROID_NDK_DIR" ] \ && [ -d "$ANDROID_CMAKE_DIR" ] } @@ -148,7 +148,7 @@ required_sdk_packages_present() { required_emulator_packages_present() { required_sdk_packages_present \ && [ -x "$SDK_DIR/emulator/emulator" ] \ - && [ -d "$SDK_DIR/system-images/android-35/google_apis/x86_64" ] + && [ -d "$SDK_DIR/system-images/android-36/google_apis/x86_64" ] } auto_commit_if_needed() { @@ -598,8 +598,8 @@ ensure_sdk_packages() { log "Installing required Android SDK packages" "$CMDLINE_TOOLS_LATEST_DIR/bin/sdkmanager" --sdk_root="$SDK_DIR" \ "platform-tools" \ - "platforms;android-35" \ - "build-tools;35.0.0" \ + "platforms;android-36" \ + "build-tools;36.0.0" \ "$ANDROID_NDK_PACKAGE" \ "$ANDROID_CMAKE_PACKAGE" @@ -629,8 +629,8 @@ ensure_emulator_sdk_packages() { log "Installing Android emulator SDK packages" "$CMDLINE_TOOLS_LATEST_DIR/bin/sdkmanager" --sdk_root="$SDK_DIR" \ "platform-tools" \ - "platforms;android-35" \ - "build-tools;35.0.0" \ + "platforms;android-36" \ + "build-tools;36.0.0" \ "$ANDROID_NDK_PACKAGE" \ "$ANDROID_CMAKE_PACKAGE" \ "emulator" \ diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 13734af..e886e2d 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -19,13 +19,13 @@ plugins { android { namespace = "solutions.tretter.githugandroid" - compileSdk = 35 + compileSdk = 36 ndkVersion = "27.2.12479018" defaultConfig { applicationId = "solutions.tretter.githugandroid" minSdk = 26 - targetSdk = 35 + targetSdk = 36 versionCode = 184 versionName = "0.1.183"