diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 5e41d6e2..ffaa8e32 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -22,7 +22,7 @@ jobs: - name: Run sdkmanager update run: ${ANDROID_HOME}/tools/bin/sdkmanager --update - name: Install android platform, platform-tools, build-tools and ndk - run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;23.1.7779620" + run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-33" "build-tools;33.0.0" "ndk;23.1.7779620" - name: Setup NDK path run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV - name: Install Qt (Desktop) diff --git a/gpxsee.pro b/gpxsee.pro index 67c23ed1..fb397573 100644 --- a/gpxsee.pro +++ b/gpxsee.pro @@ -585,7 +585,7 @@ android { message("OpenSSL not found, building without HTTPS support!") } - ANDROID_TARGET_SDK_VERSION = 31 + ANDROID_TARGET_SDK_VERSION = 33 ANDROID_VERSION_NAME = $$VERSION ANDROID_VERSION_CODE = $$versionCode($$ANDROID_VERSION_NAME) ANDROID_PACKAGE_SOURCE_DIR = $$PWD/pkg/android diff --git a/pkg/android/build.gradle b/pkg/android/build.gradle index 70c307b0..ebc31e1a 100644 --- a/pkg/android/build.gradle +++ b/pkg/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.2.1' } } @@ -34,12 +34,13 @@ android { * Changing them manually might break the compilation! *******************************************************/ - //compileSdkVersion androidCompileSdkVersion.toInteger() - compileSdkVersion 31 - //buildToolsVersion androidBuildToolsVersion - buildToolsVersion '31.0.0' + compileSdkVersion androidCompileSdkVersion.toInteger() + buildToolsVersion androidBuildToolsVersion ndkVersion androidNdkVersion + // Extract native libraries from the APK + packagingOptions.jniLibs.useLegacyPackaging true + sourceSets { main { manifest.srcFile 'AndroidManifest.xml'