1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-12-05 00:39:09 +01:00

Compare commits

..

5 Commits

Author SHA1 Message Date
f5d4974d57 Back to the previous workaround
Until we can switch to something newer than Qt 6.4.0 (which we can't due to
numerous Qt bugs...), we have to hardcode the android SDK version here due
to QTBUG-112465.
2023-08-18 23:24:54 +02:00
e0e2d38ec1 Try a cleaner gradle fix/workaround 2023-08-18 22:58:04 +02:00
80b9dcfd5e broken androiddeployqt workaround 2023-08-18 22:48:42 +02:00
836163a8b2 Version++ 2023-08-18 22:17:43 +02:00
9cead54213 Switched to Android SDK 33 2023-08-18 22:16:43 +02:00
5 changed files with 12 additions and 10 deletions

View File

@ -1,4 +1,4 @@
version: 13.6.{build} version: 13.7.{build}
configuration: configuration:
- Release - Release

View File

@ -22,7 +22,7 @@ jobs:
- name: Run sdkmanager update - name: Run sdkmanager update
run: ${ANDROID_HOME}/tools/bin/sdkmanager --update run: ${ANDROID_HOME}/tools/bin/sdkmanager --update
- name: Install android platform, platform-tools, build-tools and ndk - 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 - name: Setup NDK path
run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV
- name: Install Qt (Desktop) - name: Install Qt (Desktop)

View File

@ -3,7 +3,7 @@ unix:!macx:!android {
} else { } else {
TARGET = GPXSee TARGET = GPXSee
} }
VERSION = 13.6 VERSION = 13.7
QT += core \ QT += core \
@ -585,7 +585,7 @@ android {
message("OpenSSL not found, building without HTTPS support!") message("OpenSSL not found, building without HTTPS support!")
} }
ANDROID_TARGET_SDK_VERSION = 31 ANDROID_TARGET_SDK_VERSION = 33
ANDROID_VERSION_NAME = $$VERSION ANDROID_VERSION_NAME = $$VERSION
ANDROID_VERSION_CODE = $$versionCode($$ANDROID_VERSION_NAME) ANDROID_VERSION_CODE = $$versionCode($$ANDROID_VERSION_NAME)
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/pkg/android ANDROID_PACKAGE_SOURCE_DIR = $$PWD/pkg/android

View File

@ -5,7 +5,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.0.2' classpath 'com.android.tools.build:gradle:7.2.1'
} }
} }
@ -34,12 +34,14 @@ android {
* Changing them manually might break the compilation! * Changing them manually might break the compilation!
*******************************************************/ *******************************************************/
//compileSdkVersion androidCompileSdkVersion.toInteger() //compileSdkVersion androidCompileSdkVersion
compileSdkVersion 31 compileSdkVersion "android-33"
//buildToolsVersion androidBuildToolsVersion buildToolsVersion androidBuildToolsVersion
buildToolsVersion '31.0.0'
ndkVersion androidNdkVersion ndkVersion androidNdkVersion
// Extract native libraries from the APK
packagingOptions.jniLibs.useLegacyPackaging true
sourceSets { sourceSets {
main { main {
manifest.srcFile 'AndroidManifest.xml' manifest.srcFile 'AndroidManifest.xml'

View File

@ -37,7 +37,7 @@ Unicode true
; The name of the installer ; The name of the installer
Name "GPXSee" Name "GPXSee"
; Program version ; Program version
!define VERSION "13.6" !define VERSION "13.7"
; The file to write ; The file to write
OutFile "GPXSee-${VERSION}_x64.exe" OutFile "GPXSee-${VERSION}_x64.exe"