From 23da15a5257dcfac80aa0f0f6ab193da82e2da67 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 6 Jun 2021 14:38:03 +1000
Subject: [PATCH] Android: Update to Gradle Plugin v4.2.1

---
 android/.idea/compiler.xml                       | 6 ++++++
 android/.idea/runConfigurations.xml              | 1 +
 android/app/build.gradle                         | 9 ++++++++-
 android/build.gradle                             | 2 +-
 android/gradle/wrapper/gradle-wrapper.properties | 4 ++--
 5 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 android/.idea/compiler.xml

diff --git a/android/.idea/compiler.xml b/android/.idea/compiler.xml
new file mode 100644
index 000000000..fb7f4a8a4
--- /dev/null
+++ b/android/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/android/.idea/runConfigurations.xml b/android/.idea/runConfigurations.xml
index 7f68460d8..e497da999 100644
--- a/android/.idea/runConfigurations.xml
+++ b/android/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 44f1292dd..affe998b3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    buildToolsVersion "30.0.2"
     defaultConfig {
         applicationId "com.github.stenzek.duckstation"
         minSdkVersion 23
@@ -14,6 +14,10 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
+            ndk {
+                debugSymbolLevel "FULL"
+            }
         }
     }
 
@@ -38,6 +42,9 @@ android {
     sourceSets {
         main.assets.srcDirs += "../../data"
     }
+
+    // Blocked on R21 until CMake is updated to 3.19 or later.
+    ndkVersion '21.4.7075529'
 }
 
 dependencies {
diff --git a/android/build.gradle b/android/build.gradle
index fd3a3028e..0be6f99d2 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:4.2.1'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index a7e334424..7b61d1ea9 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Nov 27 22:04:24 AEST 2019
+#Sun Jun 06 12:33:06 AEST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip