Bump android version to 34

opengisch · Aug 11, 2024 · 23e5c72 · 23e5c72
1 parent 3cddf61
commit 23e5c72
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.docker/android_dev/Dockerfile b/.docker/android_dev/Dockerfile
@@ -63,7 +63,7 @@ shopt -s extglob
 mkdir /android-sdk/cmdline-tools/latest
 mv /android-sdk/cmdline-tools/!(latest) /android-sdk/cmdline-tools/latest
 yes | /android-sdk/cmdline-tools/latest/bin/sdkmanager --licenses
-/android-sdk/cmdline-tools/latest/bin/sdkmanager "platforms;android-33" "build-tools;29.0.2" "platform-tools" "tools"
+/android-sdk/cmdline-tools/latest/bin/sdkmanager "platforms;android-34" "build-tools;34.0.0" "platform-tools" "tools"
 END_OF_SCRIPT
 
 ENV ANDROID_NDK_HOME /android-ndk-r25c

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -81,7 +81,7 @@ jobs:
           echo "ANDROID_NDK=/usr/local/lib/android/sdk/ndk/25.2.9519653" >> $GITHUB_ENV
           echo "ANDROID_NDK_HOME=/usr/local/lib/android/sdk/ndk/25.2.9519653" >> $GITHUB_ENV
           echo "ANDROID_NDK_ROOT=/usr/local/lib/android/sdk/ndk/25.2.9519653" >> $GITHUB_ENV
-          echo "ANDROID_BUILD_TOOLS_VERSION=33.0.0" >> $GITHUB_ENV
+          echo "ANDROID_BUILD_TOOLS_VERSION=34.0.0" >> $GITHUB_ENV
           echo "ndk.dir=/usr/local/lib/android/sdk/ndk/25.2.9519653" >> local.properties
           ALL_FILES_ACCESS=${{ matrix.all_files_access }} ./scripts/ci/env_gh.sh
 

diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake
@@ -20,8 +20,8 @@ elseif(VCPKG_TARGET_TRIPLET STREQUAL "x86-android")
 endif()
 
 if(ANDROID_ABI)
-  set(ANDROID_BUILD_TOOLS_VERSION "33.0.0" CACHE STRING "Android build-tools version")
-  set(ANDROID_TARGET_PLATFORM 33 CACHE INT "Target Android platform SDK version")
+  set(ANDROID_BUILD_TOOLS_VERSION "34.0.0" CACHE STRING "Android build-tools version")
+  set(ANDROID_TARGET_PLATFORM 34 CACHE INT "Target Android platform SDK version")
   set(ANDROID_PLATFORM 21 CACHE INT "Minimum Android platform SDK version")
   set(ANDROID_PLATFORM_INT 21 CACHE INT "Minimum Android platform SDK version") # Used in build.gradle.in
   set(ANDROID_CPP_FEATURES "rtti exceptions")