From 1c73adf4dd18a8baa52860878658238ab4ba7eee Mon Sep 17 00:00:00 2001 From: tehcneko <88844448+tehcneko@users.noreply.github.com> Date: Sun, 22 Aug 2021 22:47:16 +0800 Subject: [PATCH] Enable R8 full mode --- app/build.gradle.kts | 2 +- app/proguard-rules.pro | 2 +- gradle.properties | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c043a134..581445d4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -180,7 +180,7 @@ dependencies { implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("com.github.bumptech.glide:glide:$glideVersion") implementation("com.google.android.material:material:1.5.0-alpha02") - implementation("com.google.code.gson:gson:2.8.7") + implementation("com.google.code.gson:gson:2.8.8") implementation("com.takisoft.preferencex:preferencex:1.1.0") implementation("com.takisoft.preferencex:preferencex-colorpicker:1.1.0") implementation("com.squareup.okhttp3:okhttp:$okhttpVersion") diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 9d93b13f..08ee953f 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -23,7 +23,7 @@ # Gson uses generic type information stored in a class file when working with fields. Proguard # removes such information by default, so configure it to keep all of it. --keepattributes Signature,InnerClasses +-keepattributes Signature,InnerClasses,EnclosingMethod -dontwarn org.jetbrains.annotations.NotNull -dontwarn org.jetbrains.annotations.Nullable diff --git a/gradle.properties b/gradle.properties index 2293e8a4..da43e89a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,5 +10,7 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true +android.enableAppCompileTimeRClass=true +android.enableR8.fullMode=true android.nonTransitiveRClass=true android.useAndroidX=true