diff --git a/CMakeLists.txt b/CMakeLists.txt index 2f0c2f421b0..c3a021ef929 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -410,8 +410,8 @@ elseif(ANDROID) set_target_properties(${PROJECT_NAME} PROPERTIES # QT_ANDROID_ABIS ${ANDROID_ABI} - QT_ANDROID_MIN_SDK_VERSION 26 - QT_ANDROID_TARGET_SDK_VERSION 34 + QT_ANDROID_MIN_SDK_VERSION 25 + QT_ANDROID_TARGET_SDK_VERSION 35 QT_ANDROID_PACKAGE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/android QT_ANDROID_VERSION_NAME ${CMAKE_PROJECT_VERSION} QT_ANDROID_VERSION_CODE ${ANDROID_VERSION_CODE} diff --git a/android/build.gradle b/android/build.gradle index ba5377611e5..101adece335 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.5.1' + classpath 'com.android.tools.build:gradle:8.6.1' } } @@ -23,6 +23,9 @@ dependencies { implementation 'com.github.mik3y:usb-serial-for-android:3.8.0' } +def getTimestampStr() { return new Date().format('yyyyMMddHHmmss') } +def timestampInt = (int)(new Date().getTime() / 1000 / 1) + android { /******************************************************* * The following variables: @@ -87,7 +90,7 @@ android { namespace "org.mavlink.qgroundcontrol" // versionName "5.0" - // versionCode 5 + // versionCode timestampInt // println "applicationId: ${applicationId}" println "minSdkVersion: ${minSdkVersion}" @@ -97,6 +100,7 @@ android { println "versionName: ${versionName}" } + println "timestamp: " + getTimestampStr() println "androidCompileSdkVersion: ${compileSdkVersion}" println "androidBuildToolsVersion: ${buildToolsVersion}" println "androidNdkVersion: ${ndkVersion}" diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar index e6441136f3d..a4b76b9530d 100644 Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 9355b415575..0aaefbcaf0f 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/android/gradlew b/android/gradlew index 97de990bb40..d95bf6131dc 100755 --- a/android/gradlew +++ b/android/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/android/gradlew.bat b/android/gradlew.bat index 66f1aa79203..6a90cee9b03 100644 --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ##########################################################################