From 3fb8a5938fbdd961ba29e0aaf26854d0375db985 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 1 Mar 2024 08:03:58 -0500
Subject: [PATCH] Updates to Android Studio Iguana

---
 app/build.gradle                         | 5 ++---
 build.gradle                             | 4 ++--
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 quartz/build.gradle                      | 7 ++++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c91e93ea9..b83458b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -145,14 +145,13 @@ android {
         // Should match compose version : https://developer.android.com/jetpack/androidx/releases/compose-kotlin
         kotlinCompilerExtensionVersion "1.5.8"
     }
-
     packagingOptions {
         resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
+            excludes += ['/META-INF/{AL2.0,LGPL2.1}', '**/libscrypt.dylib']
         }
-        exclude '**/libscrypt.dylib'
     }
 
+
     lint {
         disable 'MissingTranslation'
     }
diff --git a/build.gradle b/build.gradle
index ac635ba5f..1962c551a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,8 +20,8 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '8.2.2' apply false
-    id 'com.android.library' version '8.2.2' apply false
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.22' apply false
     id 'org.jetbrains.kotlin.jvm' version '1.9.22' apply false
     id 'androidx.benchmark' version '1.2.3' apply false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index df554462d..c738a045f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jan 04 09:23:50 EST 2023
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/quartz/build.gradle b/quartz/build.gradle
index 48bc3289f..0b3565103 100644
--- a/quartz/build.gradle
+++ b/quartz/build.gradle
@@ -33,11 +33,12 @@ android {
         jvmTarget = '17'
         freeCompilerArgs += "-Xstring-concat=inline"
     }
-
     packagingOptions {
-        // delete native scrypt lib because we cannot use dylibs in android
-        exclude '**/libscrypt.dylib'
+        resources {
+            excludes += ['**/libscrypt.dylib']
+        }
     }
+
 }
 
 dependencies {