From 764f0a914ec8407eae9e8f1f14f6ca4189185bd5 Mon Sep 17 00:00:00 2001
From: Carter Jernigan <git@carterjernigan.com>
Date: Tue, 20 Sep 2022 07:25:57 -0400
Subject: [PATCH] [#341] Android Gradle Plugin 7.3.0

---
 app/build.gradle                                          | 6 ++++--
 app/src/main/AndroidManifest.xml                          | 3 +--
 build.gradle.kts                                          | 2 +-
 buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt | 2 +-
 feedback/build.gradle                                     | 1 +
 feedback/src/main/AndroidManifest.xml                     | 3 +--
 lockbox/build.gradle                                      | 1 +
 lockbox/src/main/AndroidManifest.xml                      | 3 +--
 qrecycler/build.gradle                                    | 1 +
 qrecycler/src/main/AndroidManifest.xml                    | 3 +--
 10 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 03fdaf9..3f54cbd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -105,9 +105,11 @@ android {
         }
     }
     packagingOptions {
-        exclude 'META-INF/AL2.0'
-        exclude 'META-INF/LGPL2.1'
+        resources {
+            excludes += ['META-INF/AL2.0', 'META-INF/LGPL2.1']
+        }
     }
+    namespace 'cash.z.ecc.android'
     applicationVariants.all { variant ->
         variant.outputs.all {
             if (variant.buildType.name == "qa") {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5a71246..baaecf1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cash.z.ecc.android">
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.CAMERA" />
diff --git a/build.gradle.kts b/build.gradle.kts
index 426207d..5da59e1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.2.2")
+        classpath("com.android.tools.build:gradle:7.3.0")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${cash.z.ecc.android.Deps.kotlinVersion}")
         classpath("com.bugsnag:bugsnag-android-gradle-plugin:4.7.5")
         classpath("androidx.navigation:navigation-safe-args-gradle-plugin:${cash.z.ecc.android.Deps.navigationVersion}")
diff --git a/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt b/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt
index ab85b3f..d621af5 100644
--- a/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt
+++ b/buildSrc/src/main/java/cash/z/ecc/android/Dependencies.kt
@@ -4,7 +4,7 @@ object Deps {
     // For use in the top-level build.gradle which gives an error when provided
     // `Deps.Kotlin.version` directly
     const val kotlinVersion =       "1.7.10"
-    const val navigationVersion =   "2.3.5"
+    const val navigationVersion =   "2.5.2"
 
     const val compileSdkVersion =   31
     const val minSdkVersion =       21
diff --git a/feedback/build.gradle b/feedback/build.gradle
index dd710ea..c71cfef 100644
--- a/feedback/build.gradle
+++ b/feedback/build.gradle
@@ -29,6 +29,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'cash.z.ecc.android.feedback'
 
 }
 
diff --git a/feedback/src/main/AndroidManifest.xml b/feedback/src/main/AndroidManifest.xml
index c0e0563..75bdb7d 100644
--- a/feedback/src/main/AndroidManifest.xml
+++ b/feedback/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cash.z.ecc.android.feedback" />
+    xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/lockbox/build.gradle b/lockbox/build.gradle
index 0aedb88..9aa0da2 100644
--- a/lockbox/build.gradle
+++ b/lockbox/build.gradle
@@ -30,6 +30,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'cash.z.ecc.android.lockbox'
 
 }
 
diff --git a/lockbox/src/main/AndroidManifest.xml b/lockbox/src/main/AndroidManifest.xml
index b801d63..75bdb7d 100644
--- a/lockbox/src/main/AndroidManifest.xml
+++ b/lockbox/src/main/AndroidManifest.xml
@@ -1,3 +1,2 @@
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cash.z.ecc.android.lockbox" />
+    xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/qrecycler/build.gradle b/qrecycler/build.gradle
index 9b3a969..c6148ba 100644
--- a/qrecycler/build.gradle
+++ b/qrecycler/build.gradle
@@ -26,6 +26,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'cash.z.android.qrecycler'
 
 }
 
diff --git a/qrecycler/src/main/AndroidManifest.xml b/qrecycler/src/main/AndroidManifest.xml
index 2ef941f..2f3ca54 100644
--- a/qrecycler/src/main/AndroidManifest.xml
+++ b/qrecycler/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="cash.z.android.qrecycler" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.CAMERA" />
 </manifest>