summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Charles Lombardo2023-05-04 04:07:44 -0400
committerGravatar bunnei2023-06-03 00:05:59 -0700
commit56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036 (patch)
tree8141da6cb6f11e1c9f4bf5faf517e26b8470e4e1 /src
parentandroid: Enable non-transitive R classes (diff)
downloadyuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.tar.gz
yuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.tar.xz
yuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.zip
android: Migrate to AGP 8.0.1
Diffstat (limited to 'src')
-rw-r--r--src/android/app/build.gradle.kts6
-rw-r--r--src/android/app/proguard-rules.pro11
-rw-r--r--src/android/build.gradle.kts4
-rw-r--r--src/android/gradle.properties2
4 files changed, 17 insertions, 6 deletions
diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts
index 379adb08c..3d9635049 100644
--- a/src/android/app/build.gradle.kts
+++ b/src/android/app/build.gradle.kts
@@ -24,12 +24,12 @@ android {
24 } 24 }
25 25
26 compileOptions { 26 compileOptions {
27 sourceCompatibility = JavaVersion.VERSION_11 27 sourceCompatibility = JavaVersion.VERSION_17
28 targetCompatibility = JavaVersion.VERSION_11 28 targetCompatibility = JavaVersion.VERSION_17
29 } 29 }
30 30
31 kotlinOptions { 31 kotlinOptions {
32 jvmTarget = "11" 32 jvmTarget = "17"
33 } 33 }
34 34
35 lint { 35 lint {
diff --git a/src/android/app/proguard-rules.pro b/src/android/app/proguard-rules.pro
index 2f695757c..002f641ea 100644
--- a/src/android/app/proguard-rules.pro
+++ b/src/android/app/proguard-rules.pro
@@ -1,2 +1,13 @@
1# To get usable stack traces 1# To get usable stack traces
2-dontobfuscate 2-dontobfuscate
3
4# Suppress warnings for R8
5-dontwarn org.bouncycastle.jsse.BCSSLParameters
6-dontwarn org.bouncycastle.jsse.BCSSLSocket
7-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
8-dontwarn org.conscrypt.Conscrypt$Version
9-dontwarn org.conscrypt.Conscrypt
10-dontwarn org.conscrypt.ConscryptHostnameVerifier
11-dontwarn org.openjsse.javax.net.ssl.SSLParameters
12-dontwarn org.openjsse.javax.net.ssl.SSLSocket
13-dontwarn org.openjsse.net.ssl.OpenJSSE
diff --git a/src/android/build.gradle.kts b/src/android/build.gradle.kts
index 442209666..5d134f20f 100644
--- a/src/android/build.gradle.kts
+++ b/src/android/build.gradle.kts
@@ -1,7 +1,7 @@
1// Top-level build file where you can add configuration options common to all sub-projects/modules. 1// Top-level build file where you can add configuration options common to all sub-projects/modules.
2plugins { 2plugins {
3 id("com.android.application") version "7.4.2" apply false 3 id("com.android.application") version "8.0.1" apply false
4 id("com.android.library") version "7.4.2" apply false 4 id("com.android.library") version "8.0.1" apply false
5 id("org.jetbrains.kotlin.android") version "1.8.10" apply false 5 id("org.jetbrains.kotlin.android") version "1.8.10" apply false
6} 6}
7 7
diff --git a/src/android/gradle.properties b/src/android/gradle.properties
index 82b01e7d3..4f4f20eb6 100644
--- a/src/android/gradle.properties
+++ b/src/android/gradle.properties
@@ -11,4 +11,4 @@ android.useAndroidX=true
11org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 11org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
12# Kotlin code style for this project: "official" or "obsolete": 12# Kotlin code style for this project: "official" or "obsolete":
13kotlin.code.style=official 13kotlin.code.style=official
14android.nonTransitiveRClass=true 14android.defaults.buildfeatures.buildconfig=true