VERY experimental Nintendo Switch 2 emulator
C++
android: Migrate to AGP 8.0.1
Charles Lombardo1367956b0554
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.ktsindex 379adb08c7..3d96350490 100644--- a/src/android/app/build.gradle.kts+++ b/src/android/app/build.gradle.kts@@ -24,12 +24,12 @@ android {}compileOptions {- sourceCompatibility = JavaVersion.VERSION_11- targetCompatibility = JavaVersion.VERSION_11+ sourceCompatibility = JavaVersion.VERSION_17+ targetCompatibility = JavaVersion.VERSION_17}kotlinOptions {- jvmTarget = "11"+ jvmTarget = "17"}lint {diff --git a/src/android/app/proguard-rules.pro b/src/android/app/proguard-rules.proindex 2f695757c0..002f641ea8 100644--- a/src/android/app/proguard-rules.pro+++ b/src/android/app/proguard-rules.pro@@ -1,2 +1,13 @@# To get usable stack traces-dontobfuscate++# Suppress warnings for R8+-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.OpenJSSEdiff --git a/src/android/build.gradle.kts b/src/android/build.gradle.ktsindex 4422096668..5d134f20f8 100644--- a/src/android/build.gradle.kts+++ b/src/android/build.gradle.kts@@ -1,7 +1,7 @@// 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.1" apply false+ id("com.android.library") version "8.0.1" apply falseid("org.jetbrains.kotlin.android") version "1.8.10" apply false}diff --git a/src/android/gradle.properties b/src/android/gradle.propertiesindex 82b01e7d35..4f4f20eb66 100644--- a/src/android/gradle.properties+++ b/src/android/gradle.properties@@ -11,4 +11,4 @@ android.useAndroidX=trueorg.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8# Kotlin code style for this project: "official" or "obsolete":kotlin.code.style=official-android.nonTransitiveRClass=true+android.defaults.buildfeatures.buildconfig=true