Bump android version to 33

opengisch · Aug 18, 2023 · f93cbb6 · f93cbb6 · qfield-fairy · Aug 18, 2023
1 parent e34b658
commit f93cbb6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/.docker/android_dev/tools/package-list-minimal.txt b/.docker/android_dev/tools/package-list-minimal.txt
@@ -1,4 +1,4 @@
 build-tools;29.0.2
 platform-tools
-platforms;android-31
+platforms;android-33
 tools
diff --git a/.docker/android_dev/tools/package-list.txt b/.docker/android_dev/tools/package-list.txt
@@ -88,23 +88,7 @@ lldb;3.1
 ndk-bundle
 patcher;v4
 platform-tools
-platforms;android-14
-platforms;android-15
-platforms;android-16
-platforms;android-17
-platforms;android-18
-platforms;android-19
-platforms;android-20
-platforms;android-21
-platforms;android-22
-platforms;android-23
-platforms;android-24
-platforms;android-25
-platforms;android-26
-platforms;android-27
-platforms;android-28
-platforms;android-29
-platforms;android-31
+platforms;android-33
 system-images;android-14;default;armeabi-v7a
 system-images;android-15;default;armeabi-v7a
 system-images;android-15;default;x86

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -105,7 +105,7 @@ jobs:
         run: |
           echo "ndk.dir=$ANDROID_NDK_HOME" >> local.properties
           echo "yes" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --uninstall "ndk-bundle"
-          echo "yes" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager "platforms;android-31" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" "ndk;$ANDROID_NDK_VERSION" tools platform-tools
+          echo "yes" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager "platforms;android-33" "build-tools;$ANDROID_BUILD_TOOLS_VERSION" "ndk;$ANDROID_NDK_VERSION" tools platform-tools
           echo "yes" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --licenses
 
       - name: 🌱 Install dependencies and generate project files

diff --git a/cmake/Platform.cmake b/cmake/Platform.cmake
@@ -22,7 +22,7 @@ endif()
 if(ANDROID_ABI)
   set(ANDROID_NDK_VERSION "$ENV{ANDROID_NDK_HOME}" CACHE STRING "Android NDK version")
   set(ANDROID_BUILD_TOOLS_VERSION "30.0.3" CACHE STRING "Android build-tools version")
-  set(ANDROID_TARGET_PLATFORM 31 CACHE INT "Target Android platform SDK version")
+  set(ANDROID_TARGET_PLATFORM 33 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")