From 2eaef1cb27b72d5eb486baada9f992b1d3373073 Mon Sep 17 00:00:00 2001
From: Dorian Zedler <dorian@itsblue.de>
Date: Tue, 2 Aug 2022 22:23:26 +0200
Subject: [PATCH] Chore:  New android version

---
 LedDisplayController/LedDisplayController.pro    | 16 +++++++++++++++-
 LedDisplayController/android/AndroidManifest.xml |  2 +-
 LedDisplayController/android/build.gradle        |  3 +--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/LedDisplayController/LedDisplayController.pro b/LedDisplayController/LedDisplayController.pro
index 492ae1a..1f6144e 100644
--- a/LedDisplayController/LedDisplayController.pro
+++ b/LedDisplayController/LedDisplayController.pro
@@ -2,7 +2,7 @@ QT += gui quick bluetooth quickcontrols2
 CONFIG += c++11
 
 TARGET = ItsblueLedDisplayController
-VERSION = 1.0.0
+VERSION = 1.2.0
 
 TEMPLATE = app
 
@@ -54,6 +54,20 @@ android {
 QT += androidextras
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
 ANDROID_ABIS = "armeabi-v7a arm64-v8a"
+
+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)
+ANDROID_TARGET_SDK_VERSION = 30
 }
 
 ANDROID_ABIS = armeabi-v7a arm64-v8a
diff --git a/LedDisplayController/android/AndroidManifest.xml b/LedDisplayController/android/AndroidManifest.xml
index 2b130af..132a9e5 100644
--- a/LedDisplayController/android/AndroidManifest.xml
+++ b/LedDisplayController/android/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="de.itsblue.LedDisplayController" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.1" android:versionCode="4" android:installLocation="auto">
+<manifest package="de.itsblue.LedDisplayController" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
          Remove the comment if you do not require these default permissions. -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/LedDisplayController/android/build.gradle b/LedDisplayController/android/build.gradle
index 8039fc4..d5b3b93 100644
--- a/LedDisplayController/android/build.gradle
+++ b/LedDisplayController/android/build.gradle
@@ -63,7 +63,6 @@ android {
     defaultConfig {
         resConfig "en"
         minSdkVersion = qtMinSdkVersion
-        targetSdkVersion = 29
-        //qtTargetSdkVersion
+        targetSdkVersion = qtTargetSdkVersion
     }
 }