mirror of
https://github.com/tumic0/GPXSee.git
synced 2024-12-03 16:09:08 +01:00
Compare commits
5 Commits
03711ede97
...
f5d4974d57
Author | SHA1 | Date | |
---|---|---|---|
f5d4974d57 | |||
e0e2d38ec1 | |||
80b9dcfd5e | |||
836163a8b2 | |||
9cead54213 |
@ -1,4 +1,4 @@
|
||||
version: 13.6.{build}
|
||||
version: 13.7.{build}
|
||||
|
||||
configuration:
|
||||
- Release
|
||||
|
2
.github/workflows/android.yml
vendored
2
.github/workflows/android.yml
vendored
@ -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)
|
||||
|
@ -3,7 +3,7 @@ unix:!macx:!android {
|
||||
} else {
|
||||
TARGET = GPXSee
|
||||
}
|
||||
VERSION = 13.6
|
||||
VERSION = 13.7
|
||||
|
||||
|
||||
QT += core \
|
||||
@ -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
|
||||
|
@ -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,14 @@ android {
|
||||
* Changing them manually might break the compilation!
|
||||
*******************************************************/
|
||||
|
||||
//compileSdkVersion androidCompileSdkVersion.toInteger()
|
||||
compileSdkVersion 31
|
||||
//buildToolsVersion androidBuildToolsVersion
|
||||
buildToolsVersion '31.0.0'
|
||||
//compileSdkVersion androidCompileSdkVersion
|
||||
compileSdkVersion "android-33"
|
||||
buildToolsVersion androidBuildToolsVersion
|
||||
ndkVersion androidNdkVersion
|
||||
|
||||
// Extract native libraries from the APK
|
||||
packagingOptions.jniLibs.useLegacyPackaging true
|
||||
|
||||
sourceSets {
|
||||
main {
|
||||
manifest.srcFile 'AndroidManifest.xml'
|
||||
|
@ -37,7 +37,7 @@ Unicode true
|
||||
; The name of the installer
|
||||
Name "GPXSee"
|
||||
; Program version
|
||||
!define VERSION "13.6"
|
||||
!define VERSION "13.7"
|
||||
|
||||
; The file to write
|
||||
OutFile "GPXSee-${VERSION}_x64.exe"
|
||||
|
Loading…
Reference in New Issue
Block a user