From bc5804e22e376268b551436a27526c9e9d0d812b Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Wed, 11 Aug 2021 20:04:43 +0200
Subject: [PATCH] Bump Android API target level to 30

---
 nymea-app/nymea-app.pro               | 3 +++
 packaging/android/AndroidManifest.xml | 1 -
 packaging/android/build.gradle        | 7 +++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro
index e15edcfc..c0b83888 100644
--- a/nymea-app/nymea-app.pro
+++ b/nymea-app/nymea-app.pro
@@ -71,6 +71,9 @@ linux:!android:!ubports: {
 android {
     include(../3rdParty/android/android_openssl/openssl.pri)
 
+    ANDROID_MIN_SDK_VERSION = 21
+    ANDROID_TARGET_SDK_VERSION = 30
+
     QT += androidextras
     HEADERS += platformintegration/android/platformhelperandroid.h
     SOURCES += platformintegration/android/platformhelperandroid.cpp
diff --git a/packaging/android/AndroidManifest.xml b/packaging/android/AndroidManifest.xml
index 75bb562f..2846b6de 100644
--- a/packaging/android/AndroidManifest.xml
+++ b/packaging/android/AndroidManifest.xml
@@ -154,7 +154,6 @@
 
     </application>
 
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
diff --git a/packaging/android/build.gradle b/packaging/android/build.gradle
index 57fecaab..ee31313a 100644
--- a/packaging/android/build.gradle
+++ b/packaging/android/build.gradle
@@ -95,7 +95,14 @@ android {
         abortOnError false
     }
 
+    // Do not compress Qt binary resources file
+    aaptOptions {
+        noCompress 'rcc'
+    }
+
     defaultConfig {
         resConfigs "en", "de", "ko", "it", "nl", "es"
+        minSdkVersion = qtMinSdkVersion
+        targetSdkVersion = qtTargetSdkVersion
     }
 }