Android: bump Android target API level to 34

Bumped on network related .gradle files too. Fixes: QTBUG-119145 Change-Id: I95f70e6cda1aad7a6bd7246c623eb6f143a829cb Reviewed-by: Assam Boudjelthia <[email protected]>
RawnHelly · Nov 30, 2023 · 7b84cd6 · 7b84cd6
1 parent 321718a
commit 7b84cd6
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git 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 = 33
+ANDROID_TARGET_SDK_VERSION = 34
 
 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
@@ -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 33.
+    variable is set to API level 34.
 
     \section1 ANDROID_VERSION_CODE
 

diff --git a/src/android/jar/build.gradle b/src/android/jar/build.gradle
@@ -23,7 +23,7 @@ repositories {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
     namespace "org.qtproject.qt.android"
 
     defaultConfig {

diff --git a/src/network/android/jar/build.gradle b/src/network/android/jar/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:8.0.2'
     }
 }
 
@@ -23,12 +23,10 @@ repositories {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "33.0.3"
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 33
     }
 
     sourceSets {

diff --git a/src/plugins/networkinformation/android/jar/build.gradle b/src/plugins/networkinformation/android/jar/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.2'
+        classpath 'com.android.tools.build:gradle:8.0.2'
     }
 }
 
@@ -23,12 +23,10 @@ repositories {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "33.0.3"
+    compileSdk 34
 
     defaultConfig {
         minSdkVersion 23
-        targetSdkVersion 33
     }
 
     sourceSets {

diff --git 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{"33"};
+    QByteArray targetSdkVersion{"34"};
 
     // lib c++ path
     QString stdCppPath;