From b05c2a8697c040e0b4f4f9e0348a8d260a7ffbf8 Mon Sep 17 00:00:00 2001
From: James Brown <soylentblue@hotmail.co.uk>
Date: Wed, 30 Aug 2023 12:00:40 +1000
Subject: [PATCH] Gralde updates

---
 app/build.gradle  | 15 ++-------------
 build.gradle      | 12 +++++++-----
 gradle.properties |  1 -
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4645eb9ca..08c37eee2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,7 +29,7 @@ apply plugin: 'io.gitlab.arturbosch.detekt'
 apply plugin: 'com.dicedmelon.gradle.jacoco-android'
 
 jacoco {
-    toolVersion = "0.8.8"
+    toolVersion = "0.8.9"
 }
 
 tasks.withType(Test).configureEach {
@@ -179,6 +179,7 @@ android {
     packagingOptions {
         jniLibs {
             excludes += ['solidity/*']
+            useLegacyPackaging true
         }
         resources {
             excludes += ['META-INF/NOTICE', 'META-INF/LICENSE', 'META-INF/LICENSE.md', 'META-INF/NOTICE.md', 'META-INF/LICENSE-notice.md', 'solidity/ens/build/*.bin', 'solidity/ens/*.sol', 'solidity/ens/build/*.abi', 'en-mnemonic-word-list.txt', 'solidity/*']
@@ -229,18 +230,6 @@ tasks.register("printVersionCode") {
     }
 }
 
-/*task printVersionName {
-    doLast {
-        println android.defaultConfig.versionName
-    }
-}
-
-task printVersionCode {
-    doLast {
-        println android.defaultConfig.versionCode
-    }
-}*/
-
 gradle.projectsEvaluated({
     def username = getGitHubUsername()
     def password = getPAT()
diff --git a/build.gradle b/build.gradle
index 97136400d..467e5b77b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,6 @@ buildscript {
     repositories {
         // don't add anything here until you read to the bottom of this bracket
         google()
-        jcenter()
         mavenCentral()
         maven { url 'https://jitpack.io' }
         // WARNING WARNING WARNING
@@ -27,7 +26,6 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
         mavenCentral()
         maven { url 'https://jitpack.io' }
         // WARNING WARNING WARNING
@@ -35,13 +33,13 @@ allprojects {
         // don't do that. add that repository to app/build.gradle
     }
 
-    configurations.all {
+    configurations.configureEach {
         resolutionStrategy {
             force 'com.google.firebase:firebase-analytics:16.5.0'
         }
     }
 
-    tasks.withType(Test) {
+    tasks.withType(Test).configureEach {
         maxParallelForks = 2
         forkEvery = 80
         maxHeapSize = "2048m"
@@ -49,6 +47,10 @@ allprojects {
     }
 }
 
-task clean(type: Delete) {
+tasks.register("clean") {
     delete rootProject.buildDir
 }
+
+//task clean(type: Delete) {
+//    delete rootProject.buildDir
+//}
diff --git a/gradle.properties b/gradle.properties
index fd42c574a..a64c40f19 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -8,7 +8,6 @@ android.enableJetifier=true
 android.jetifier.ignorelist=bcprov-jdk15on,com.squareup.moshi
 android.useAndroidX=true
 org.gradle.jvmargs=-Xms2048m -Xmx4096m
-android.suppressUnsupportedCompileSdk=32
 
 # Base64 Encoded GitHub PAT,
 # Make sure only check read:packages and read:user permissions if you want to create your own PAT,