From b33b0b607abd48771aa02b8d5629e9e4bf471f07 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 8 Sep 2023 15:07:31 +0300 Subject: [PATCH] Android: bump Android target API level to 33 To follow latest Play Store requirement. Pick-to: 6.6.0 6.5 Fixes: QTBUG-112637 Change-Id: I1ef4f8b639f4b0cc759a2363b7b9b9864b159509 Reviewed-by: Ville Voutilainen (cherry picked from commit b74f180ac065741783dc4e7f793bb97e35aed7f7) Reviewed-by: Qt Cherry-pick Bot --- mkspecs/android-clang/qmake.conf | 2 +- qmake/doc/src/qmake-manual.qdoc | 2 +- src/android/jar/build.gradle | 6 +++--- src/network/android/jar/build.gradle | 6 +++--- src/plugins/networkinformation/android/jar/build.gradle | 6 +++--- src/tools/androiddeployqt/main.cpp | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf index 61a71ab61cd..a3f22470687 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf @@ -44,7 +44,7 @@ isEmpty(ALL_ANDROID_ABIS): ALL_ANDROID_ABIS = arm64-v8a armeabi-v7a x86_64 x86 CONFIG += $$ANDROID_PLATFORM ANDROID_MIN_SDK_VERSION = $$replace(ANDROID_PLATFORM, "android-", "") -ANDROID_TARGET_SDK_VERSION = 31 +ANDROID_TARGET_SDK_VERSION = 33 NDK_LLVM_PATH = $$NDK_ROOT/toolchains/llvm/prebuilt/$$NDK_HOST QMAKE_CC = $$NDK_LLVM_PATH/bin/clang diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 034d87f4be8..a457a6959c0 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1088,7 +1088,7 @@ \note This variable applies only to Android targets. Specifies the target Android API level for the project. By default, this - variable is set to API level 31. + variable is set to API level 33. \section1 ANDROID_VERSION_CODE diff --git a/src/android/jar/build.gradle b/src/android/jar/build.gradle index c947852f793..14b629f0e99 100644 --- a/src/android/jar/build.gradle +++ b/src/android/jar/build.gradle @@ -23,12 +23,12 @@ repositories { } android { - compileSdkVersion 31 - buildToolsVersion "31.0.3" + compileSdkVersion 33 + buildToolsVersion "33.0.3" defaultConfig { minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 } sourceSets { diff --git a/src/network/android/jar/build.gradle b/src/network/android/jar/build.gradle index c947852f793..14b629f0e99 100644 --- a/src/network/android/jar/build.gradle +++ b/src/network/android/jar/build.gradle @@ -23,12 +23,12 @@ repositories { } android { - compileSdkVersion 31 - buildToolsVersion "31.0.3" + compileSdkVersion 33 + buildToolsVersion "33.0.3" defaultConfig { minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 } sourceSets { diff --git a/src/plugins/networkinformation/android/jar/build.gradle b/src/plugins/networkinformation/android/jar/build.gradle index c947852f793..14b629f0e99 100644 --- a/src/plugins/networkinformation/android/jar/build.gradle +++ b/src/plugins/networkinformation/android/jar/build.gradle @@ -23,12 +23,12 @@ repositories { } android { - compileSdkVersion 31 - buildToolsVersion "31.0.3" + compileSdkVersion 33 + buildToolsVersion "33.0.3" defaultConfig { minSdkVersion 23 - targetSdkVersion 31 + targetSdkVersion 33 } sourceSets { diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index b0df0a5e31c..171d83b7b5a 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -163,7 +163,7 @@ struct Options QString versionName; QString versionCode; QByteArray minSdkVersion{"23"}; - QByteArray targetSdkVersion{"31"}; + QByteArray targetSdkVersion{"33"}; // lib c++ path QString stdCppPath;