Compare commits
7 commits
milestone/
...
main
Author | SHA1 | Date | |
---|---|---|---|
Dorian Zedler | 17e278cd53 | ||
Dorian Zedler | c7e7b1c950 | ||
Dorian Zedler | d18468b555 | ||
Dorian Zedler | 2d4689a01c | ||
Dorian Zedler | b450d3a406 | ||
Dorian Zedler | 60617daef2 | ||
Dorian Zedler | 0ae9df710c |
26
.drone.yml
Normal file
26
.drone.yml
Normal file
|
@ -0,0 +1,26 @@
|
|||
kind: pipeline
|
||||
name: build and publish Qt Android-App
|
||||
steps:
|
||||
- name: submodules
|
||||
image: alpine/git
|
||||
commands:
|
||||
- git submodule update --init --recursive
|
||||
|
||||
- name: build apk
|
||||
image: itsblue.dev/plugins/qt-android:5.15.5-1
|
||||
settings:
|
||||
qmake_arguments: "CONFIG+=release"
|
||||
androiddeployqt_arguments: "--android-platform android-31"
|
||||
|
||||
- name: publish package
|
||||
image: alpine/curl
|
||||
commands:
|
||||
- ls -l outputs
|
||||
- ls -l outputs/apk
|
||||
- ls -l outputs/apk/debug
|
||||
- "curl --fail --user $GITEA_USER:$GITEA_TOKEN --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/ScStw/generic/app/0.0.0-preview-${DRONE_COMMIT_SHA}/ScStwApp.apk"
|
||||
environment:
|
||||
GITEA_USER:
|
||||
from_secret: gitea-user
|
||||
GITEA_TOKEN:
|
||||
from_secret: gitea-token
|
2
.gitmodules
vendored
2
.gitmodules
vendored
|
@ -1,3 +1,3 @@
|
|||
[submodule "shared-libraries"]
|
||||
path = shared-libraries
|
||||
url = https://git.itsblue.de/ScStw/shared-libraries.git
|
||||
url = https://itsblue.dev/ScStw/shared-libraries.git
|
||||
|
|
19
ScStwApp.pro
19
ScStwApp.pro
|
@ -4,7 +4,7 @@ android {
|
|||
QT += androidextras
|
||||
}
|
||||
|
||||
VERSION = 1.0.0
|
||||
VERSION = 1.0.1
|
||||
QMAKE_TARGET_PRODUCT = "ScStwApp"
|
||||
QMAKE_TARGET_COMPANY = "Itsblue Development"
|
||||
QMAKE_TARGET_COPYRIGHT = "Copyright (c) by Itsblue Development"
|
||||
|
@ -73,8 +73,21 @@ DISTFILES += \
|
|||
|
||||
android {
|
||||
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
|
||||
ANDROID_VERSION_CODE = 15
|
||||
ANDROID_VERSION_NAME = $${VERSION}
|
||||
defineReplace(droidVersionCode) {
|
||||
segments = $$split(1, ".")
|
||||
for (segment, segments): vCode = "$$first(vCode)$$format_number($$segment, width=3 zeropad)"
|
||||
|
||||
contains(ANDROID_TARGET_ARCH, arm64-v8a): \
|
||||
suffix = 1
|
||||
else:contains(ANDROID_TARGET_ARCH, armeabi-v7a): \
|
||||
suffix = 0
|
||||
# add more cases as needed
|
||||
|
||||
return($$first(vCode)$$first(suffix))
|
||||
}
|
||||
|
||||
ANDROID_VERSION_NAME = $$VERSION
|
||||
ANDROID_VERSION_CODE = $$droidVersionCode($$ANDROID_VERSION_NAME)
|
||||
}
|
||||
|
||||
# This has to be the last line in the file
|
||||
|
|
|
@ -54,7 +54,7 @@ Column {
|
|||
|
||||
Label {
|
||||
width: parent.width * 1
|
||||
height: parentObj.delegateHeight * 0.8
|
||||
height: parentObj.delegateHeight * 0.6
|
||||
|
||||
|
||||
verticalAlignment: Text.AlignTop
|
||||
|
@ -67,7 +67,7 @@ Column {
|
|||
|
||||
color: appTheme.theme.colors.line
|
||||
|
||||
text: "V" + APP_VERSION + "<br>By <a href=\"https://itsblue.de\">Itsblue Development</a>"
|
||||
text: "V" + APP_VERSION + "<br><a href='https://itsblue.de/apps/scstw'><b>privacy policy</b></a>"
|
||||
|
||||
onLinkActivated: {
|
||||
Qt.openUrlExternally(link)
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 37bea9105f1c7e0c8f1a209da3d5043c61abfb44
|
||||
Subproject commit 0f269a76370d84c8d1f43a7298a59b6fac1c6980
|
Loading…
Reference in a new issue