From a5147e736b2904d86b21153058470c677f8b09bc Mon Sep 17 00:00:00 2001
From: James Sanford <jsanfordgit@froop.com>
Date: Mon, 10 Jun 2024 22:15:36 -0700
Subject: [PATCH] Update Android Studio project to gradle 8.4.2

---
 app/build.gradle                         | 2 +-
 app/src/main/AndroidManifest.xml         | 1 -
 build.gradle                             | 2 +-
 gradle.properties                        | 4 +++-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 98dbe16..a6fc9d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,7 +25,7 @@ android {
         }
     }
     ndkVersion '23.1.7779620'
-    buildToolsVersion '31.0.0'
+    namespace 'com.froop.app.kegs'
 }
 
 dependencies {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1830306..676540d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.froop.app.kegs"
     android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/build.gradle b/build.gradle
index 7778248..8948e2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:8.4.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
index c52ac9b..73d7f63 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,4 +16,6 @@ org.gradle.jvmargs=-Xmx2048m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
\ No newline at end of file
+android.enableJetifier=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e16ea58..44097e1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip