summaryrefslogtreecommitdiffstats
path: root/src/android/app
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2023-05-04 10:07:44 +0200
committerbunnei <bunneidev@gmail.com>2023-06-03 09:05:59 +0200
commit56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036 (patch)
tree8141da6cb6f11e1c9f4bf5faf517e26b8470e4e1 /src/android/app
parentandroid: Enable non-transitive R classes (diff)
downloadyuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.tar
yuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.tar.gz
yuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.tar.bz2
yuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.tar.lz
yuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.tar.xz
yuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.tar.zst
yuzu-56d3711e349bfb74fbb9a8cb09a5f6c9cb6b5036.zip
Diffstat (limited to 'src/android/app')
-rw-r--r--src/android/app/build.gradle.kts6
-rw-r--r--src/android/app/proguard-rules.pro11
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 {
}
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.pro
index 2f695757c..002f641ea 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.OpenJSSE