diff options
| author | 2023-05-04 04:07:44 -0400 | |
|---|---|---|
| committer | 2023-06-03 00:05:59 -0700 | |
| commit | 56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036 (patch) | |
| tree | 8141da6cb6f11e1c9f4bf5faf517e26b8470e4e1 /src/android/app | |
| parent | android: Enable non-transitive R classes (diff) | |
| download | yuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.tar.gz yuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.tar.xz yuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.zip | |
android: Migrate to AGP 8.0.1
Diffstat (limited to 'src/android/app')
| -rw-r--r-- | src/android/app/build.gradle.kts | 6 | ||||
| -rw-r--r-- | src/android/app/proguard-rules.pro | 11 |
2 files changed, 14 insertions, 3 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 | ||