From ab5172cd6ebe9836624649cab21b9a81171e76d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Thu, 2 Mar 2023 12:51:55 +0100
Subject: [PATCH] Gradle updates

---
 android/build.gradle                     | 10 ++++++----
 build.gradle                             |  2 +-
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index c7f80f319c..bd11462d06 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -22,7 +22,7 @@ dependencies {
 
 android {
 	flavorDimensions "variant"
-
+	namespace 'org.ppsspp.ppsspp'
 	signingConfigs {
 		debug {
 			storeFile file("debug.keystore")
@@ -51,11 +51,11 @@ android {
 		applicationId 'org.ppsspp.ppsspp'
 		if (androidGitVersion.name() != "unknown" && androidGitVersion.code() >= 14000000) {
 			// Start using automatic Android version numbers from version 1.4.
-			println "Overriding Android Version Name, Code: " + androidGitVersion.name() + " " + androidGitVersion.code();
+			println "Overriding Android Version Name, Code: " + androidGitVersion.name() + " " + androidGitVersion.code()
 			versionName androidGitVersion.name()
 			versionCode androidGitVersion.code()
 		} else {
-			println "(not using these:) Android Version Name, Code: " + androidGitVersion.name() + " " + androidGitVersion.code();
+			println "(not using these:) Android Version Name, Code: " + androidGitVersion.name() + " " + androidGitVersion.code()
 		}
 
 		new File("versionname.txt").write(androidGitVersion.name())
@@ -92,7 +92,9 @@ android {
 		}
 	}
 	packagingOptions {
-		exclude 'lib/arm64-v8a/libopenxr_loader.so'
+		jniLibs {
+			excludes += ['lib/arm64-v8a/libopenxr_loader.so']
+		}
 	}
 	sourceSets {
 		main {
diff --git a/build.gradle b/build.gradle
index d9fc3ebd95..4bf0701175 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 86463708b7..b9eead5b1f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 android.useAndroidX=true
 android.enableJetifier=true