From 7c2c5586465239f0a49fc9f10498c6c7274b8963 Mon Sep 17 00:00:00 2001
From: Charles Lombardo <clombardo169@gmail.com>
Date: Sun, 11 Jun 2023 17:54:05 -0400
Subject: [PATCH] Android: Upgrade to AGP 8.0.2

---
 Source/Android/app/proguard-rules.pro | 11 +++++++++++
 Source/Android/build.gradle           |  4 ++--
 Source/Android/gradle.properties      |  3 +++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Source/Android/app/proguard-rules.pro b/Source/Android/app/proguard-rules.pro
index 5ed4a21dce..769f7016fb 100644
--- a/Source/Android/app/proguard-rules.pro
+++ b/Source/Android/app/proguard-rules.pro
@@ -41,3 +41,14 @@
 # If there is no `java.lang.ClassValue` (for example, in Android), then R8/ProGuard will print a warning.
 # However, since in this case they will not be used, we can disable these warnings
 -dontwarn kotlinx.serialization.internal.ClassValueReferences
+
+# Required for R8 full mode
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
diff --git a/Source/Android/build.gradle b/Source/Android/build.gradle
index 5b1f7338e2..e4d6c2df91 100644
--- a/Source/Android/build.gradle
+++ b/Source/Android/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.0.2' apply false
+    id 'com.android.library' version '8.0.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
 }
diff --git a/Source/Android/gradle.properties b/Source/Android/gradle.properties
index 0d0705d1da..ac3bc4bbd0 100644
--- a/Source/Android/gradle.properties
+++ b/Source/Android/gradle.properties
@@ -14,3 +14,6 @@ android.enableJetifier=true
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false