1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: bump Android target API level to 34

Browse Source 
Bumped on network related .gradle files too.

Fixes: QTBUG-119145
Change-Id: I95f70e6cda1aad7a6bd7246c623eb6f143a829cb
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Rami Potinkara 2023-11-15 21:54:52 +02:00
parent 321718af88
commit 7b84cd62b0
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/android-clang/qmake.conf
View File

@ -44,7 +44,7 @@ isEmpty(ALL_ANDROID_ABIS): ALL_ANDROID_ABIS = arm64-v8a armeabi-v7a x86_64 x86
CONFIG += $$ANDROID_PLATFORM CONFIG += $$ANDROID_PLATFORM
ANDROID_MIN_SDK_VERSION = $$replace(ANDROID_PLATFORM, "android-", "") 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 NDK_LLVM_PATH = $$NDK_ROOT/toolchains/llvm/prebuilt/$$NDK_HOST
QMAKE_CC = $$NDK_LLVM_PATH/bin/clang QMAKE_CC = $$NDK_LLVM_PATH/bin/clang

2
qmake/doc/src/qmake-manual.qdoc
View File

@ -1088,7 +1088,7 @@
\note This variable applies only to Android targets. \note This variable applies only to Android targets.
Specifies the target Android API level for the project. By default, this 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 \section1 ANDROID_VERSION_CODE

2
src/android/jar/build.gradle
View File

@ -23,7 +23,7 @@ repositories {
} }
android { android {
compileSdk 33 compileSdk 34
namespace "org.qtproject.qt.android" namespace "org.qtproject.qt.android"
defaultConfig { defaultConfig {

6
src/network/android/jar/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
} }
dependencies { 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 { android {
compileSdkVersion 33 compileSdk 34
buildToolsVersion "33.0.3"
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 33
} }
sourceSets { sourceSets {

6
src/plugins/networkinformation/android/jar/build.gradle
View File

@ -7,7 +7,7 @@ buildscript {
} }
dependencies { 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 { android {
compileSdkVersion 33 compileSdk 34
buildToolsVersion "33.0.3"
defaultConfig { defaultConfig {
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 33
} }
sourceSets { sourceSets {

2
src/tools/androiddeployqt/main.cpp
View File

@ -163,7 +163,7 @@ struct Options
QString versionName; QString versionName;
QString versionCode; QString versionCode;
QByteArray minSdkVersion{"23"}; QByteArray minSdkVersion{"23"};
QByteArray targetSdkVersion{"33"}; QByteArray targetSdkVersion{"34"};
// lib c++ path // lib c++ path
QString stdCppPath; QString stdCppPath;