diff --git a/ci/Jenkinsfile.qt-build b/ci/Jenkinsfile.qt-build index 1130c6de58..dff3c9e845 100644 --- a/ci/Jenkinsfile.qt-build +++ b/ci/Jenkinsfile.qt-build @@ -20,7 +20,7 @@ pipeline { ) string( name: 'DOCKER_TAG_ANDROID', - defaultValue: '1.0.0-qt6.11.0-android', + defaultValue: '1.0.1-qt6.11.0-android', description: 'Docker image tag for the Andorid image' ) string( @@ -51,7 +51,7 @@ pipeline { string( name: 'ANDROID_API_LEVEL', description: 'Android API level', - defaultValue: '35', + defaultValue: '36', ) string( name: 'ANDROID_NDK_VERSION', diff --git a/mobile/DEV_SETUP.md b/mobile/DEV_SETUP.md index 05f3399c52..02d04d17b8 100644 --- a/mobile/DEV_SETUP.md +++ b/mobile/DEV_SETUP.md @@ -55,11 +55,11 @@ in with the same apple ID that's part of the development team set up in Apple De - JDK 17 - Settings > Build, Execution, Deployment > Build Tools > Gradle: Gradle JDK - Download JDK - Select 17 - Android SDK - - Settings > Languages & Framework > Android SDK - Select Android 15 - Apply + - Settings > Languages & Framework > Android SDK - Select Android 16 - Apply - Android NDK 27.2.12479018 - Settings > Languages & Framework > Android SDK > SDK Tools tab - Check Show Package Details - NDK (Side by side) > Select 27.2.12479018 - Apply -- Platform android-35 - - Installed with Android 15 +- Platform android-36 + - Installed with Android 16 - Android emulator (optional) - Installed with Android Studio - Android command-line tools @@ -107,7 +107,7 @@ qmake --version # prints qmake for android java --version # 17.0.14 emulator --version # execution works echo $ANDROID_NDK_ROOT # points to 27.2.12479018 -ls -l $ANDROID_SDK_ROOT/platforms/android-35 # android-35 in installed +ls -l $ANDROID_SDK_ROOT/platforms/android-36 # android-36 in installed avdmanager --version sdkmanager --version adb --version @@ -151,7 +151,7 @@ The build system uses several environment variables to control the build process #### Qt6 - iOS minimum deployment target: iOS 26 - iOS simulator: iPad Pro -- Android target: Android 35 +- Android target: Android 36 - Android NDK: 27.2.12479018 - Android API: 28 - JDK: 17 diff --git a/mobile/README.md b/mobile/README.md index 816dd26572..46c437f87d 100644 --- a/mobile/README.md +++ b/mobile/README.md @@ -38,12 +38,12 @@ sudo apt-get update sudo apt install android-sdk-common sdkmanager --install \ -"build-tools;35.0.1" \ +"build-tools;36.0.0" \ "emulator" \ "platform-tools" \ -"platforms;android-35" \ +"platforms;android-36" \ "ndk;27.2.12479018" \ -"system-images;android-35;google_apis;arm64-v8a" +"system-images;android-36;google_apis;arm64-v8a" ``` 2. **Verify installation:** diff --git a/mobile/android/qt6/build.gradle b/mobile/android/qt6/build.gradle index 6371d65496..6b4f56f7da 100644 --- a/mobile/android/qt6/build.gradle +++ b/mobile/android/qt6/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.8.0' + classpath 'com.android.tools.build:gradle:8.9.3' } } diff --git a/mobile/android/qt6/gradle.properties b/mobile/android/qt6/gradle.properties index 3438b87de9..7e61a777a0 100644 --- a/mobile/android/qt6/gradle.properties +++ b/mobile/android/qt6/gradle.properties @@ -1,11 +1,11 @@ android.useAndroidX=true qtGradlePluginType=com.android.application androidPackageName=app.status.mobile -androidBuildToolsVersion=35.0.0 -androidCompileSdkVersion=android-35 +androidBuildToolsVersion=36.0.0 +androidCompileSdkVersion=android-36 androidNdkVersion=27.2.12479018 qtAndroidDir=/opt/qt/6.11.0/android_arm64_v8a/src/android/java qtMinSdkVersion=28 -qtTargetSdkVersion=35 +qtTargetSdkVersion=36 qtTargetAbiList=arm64-v8a org.gradle.jvmargs=-Xmx8704M -XX:+UseParallelGC diff --git a/mobile/docker/Dockerfile b/mobile/docker/Dockerfile index aad903d3a8..07108986f0 100644 --- a/mobile/docker/Dockerfile +++ b/mobile/docker/Dockerfile @@ -6,7 +6,7 @@ ARG QT_VERSION="6.11.0" ARG QT_MODULES="qt5compat qtmultimedia qtwebsockets qtpositioning qtshadertools qtimageformats qtwebview qtconnectivity qtlottie qtscxml qtwebchannel" ARG JAVA_VERSION=17 -ARG ANDROID_API_LEVEL=35 +ARG ANDROID_API_LEVEL=36 ARG ANDROID_NDK_VERSION=27.2.12479018 ARG GOLANG_VERSION="1.24.7" ARG NIM_VERSION="2.2.4" diff --git a/mobile/scripts/buildApp.sh b/mobile/scripts/buildApp.sh index d80d3dec47..b50351ecd5 100755 --- a/mobile/scripts/buildApp.sh +++ b/mobile/scripts/buildApp.sh @@ -61,7 +61,7 @@ if [[ "${OS}" == "android" ]]; then androiddeployqt \ --input "$BUILD_DIR/android-${OUTPUT_NAME}-deployment-settings.json" \ --output "$BUILD_DIR/android-build" \ - --android-platform android-35 \ + --android-platform android-36 \ --verbose --aux-mode # Package service-only libs into the APK without adding them to Qt's