From c597bbcb5774110a134797401fbb9f0049a7f1fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <simon.stuerz@nymea.io>
Date: Thu, 5 Sep 2024 21:42:21 +0200
Subject: [PATCH] Update to gradle 8 and android SDK 34

---
 packaging/android/build.gradle                     | 14 +++++++++++---
 .../gradle/wrapper/gradle-wrapper.properties       |  3 +--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/packaging/android/build.gradle b/packaging/android/build.gradle
index 475798eb..e1dd5317 100644
--- a/packaging/android/build.gradle
+++ b/packaging/android/build.gradle
@@ -15,7 +15,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:8.2.2'
         classpath 'com.google.gms:google-services:4.3.8'
     }
 }
@@ -67,9 +67,17 @@ android {
      *******************************************************/
 
     compileSdkVersion androidCompileSdkVersion.toInteger()
-
     buildToolsVersion androidBuildToolsVersion
 
+    namespace 'io.guh.nymeaapp'
+    buildFeatures.aidl = true
+
+    packagingOptions {
+        jniLibs {
+            useLegacyPackaging = true
+        }
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -105,6 +113,6 @@ android {
     defaultConfig {
         resConfigs "en", "de", "ko", "it", "nl", "es"
         minSdkVersion = qtMinSdkVersion
-        targetSdkVersion = qtTargetSdkVersion
+        targetSdkVersion = 34
     }
 }
diff --git a/packaging/android/gradle/wrapper/gradle-wrapper.properties b/packaging/android/gradle/wrapper/gradle-wrapper.properties
index 7cd3a2e8..15de9024 100644
--- a/packaging/android/gradle/wrapper/gradle-wrapper.properties
+++ b/packaging/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Apr 10 15:27:10 PDT 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip