mirror of
https://github.com/tumic0/GPXSee.git
synced 2024-12-05 00:39:09 +01:00
Compare commits
No commits in common. "f5d4974d57bf7f11cddcdf2f253655241179437b" and "03711ede9770bcd36fa6f19d29a0dd48f8013f3a" have entirely different histories.
f5d4974d57
...
03711ede97
@ -1,4 +1,4 @@
|
|||||||
version: 13.7.{build}
|
version: 13.6.{build}
|
||||||
|
|
||||||
configuration:
|
configuration:
|
||||||
- Release
|
- Release
|
||||||
|
2
.github/workflows/android.yml
vendored
2
.github/workflows/android.yml
vendored
@ -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-33" "build-tools;33.0.0" "ndk;23.1.7779620"
|
run: ${ANDROID_HOME}/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.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)
|
||||||
|
@ -3,7 +3,7 @@ unix:!macx:!android {
|
|||||||
} else {
|
} else {
|
||||||
TARGET = GPXSee
|
TARGET = GPXSee
|
||||||
}
|
}
|
||||||
VERSION = 13.7
|
VERSION = 13.6
|
||||||
|
|
||||||
|
|
||||||
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 = 33
|
ANDROID_TARGET_SDK_VERSION = 31
|
||||||
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
|
||||||
|
@ -5,7 +5,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.2.1'
|
classpath 'com.android.tools.build:gradle:7.0.2'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -34,14 +34,12 @@ android {
|
|||||||
* Changing them manually might break the compilation!
|
* Changing them manually might break the compilation!
|
||||||
*******************************************************/
|
*******************************************************/
|
||||||
|
|
||||||
//compileSdkVersion androidCompileSdkVersion
|
//compileSdkVersion androidCompileSdkVersion.toInteger()
|
||||||
compileSdkVersion "android-33"
|
compileSdkVersion 31
|
||||||
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'
|
||||||
|
@ -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.7"
|
!define VERSION "13.6"
|
||||||
|
|
||||||
; The file to write
|
; The file to write
|
||||||
OutFile "GPXSee-${VERSION}_x64.exe"
|
OutFile "GPXSee-${VERSION}_x64.exe"
|
||||||
|
Loading…
Reference in New Issue
Block a user