diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 69ef7cb74d..279d8efd29 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -137,7 +137,7 @@ dependencies { implementation("androidx.compose.material:material-icons-extended:1.4.3") implementation("androidx.compose.ui:ui-tooling-preview:1.4.3") debugImplementation("androidx.compose.ui:ui-tooling:1.4.3") - implementation("com.google.accompanist:accompanist-webview:0.28.0") + implementation("com.google.accompanist:accompanist-webview:0.30.1") implementation("androidx.glance:glance-appwidget:1.0.0-rc01") // Modified dependencies @@ -173,7 +173,6 @@ dependencies { implementation("com.google.firebase:firebase-crashlytics-ktx") val lifecycleVersion = "2.6.1" - kapt("androidx.lifecycle:lifecycle-compiler:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-common:$lifecycleVersion") @@ -204,7 +203,7 @@ dependencies { implementation(kotlin("reflect", version = AndroidVersions.kotlin)) // JSON - val kotlinSerialization = "1.4.0" + val kotlinSerialization = "1.5.0" implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:${kotlinSerialization}") implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:${kotlinSerialization}") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json-okio:${kotlinSerialization}") @@ -218,17 +217,17 @@ dependencies { implementation("com.github.junrar:junrar:7.5.4") // HTML parser - implementation("org.jsoup:jsoup:1.15.4") + implementation("org.jsoup:jsoup:1.16.1") // Job scheduling - implementation("androidx.work:work-runtime-ktx:2.8.0") + implementation("androidx.work:work-runtime-ktx:2.8.1") implementation("com.google.guava:guava:31.1-android") implementation("com.google.android.gms:play-services-gcm:17.0.0") // Database - implementation("androidx.sqlite:sqlite-ktx:2.3.0") - implementation("com.github.requery:sqlite-android:3.39.2") + implementation("androidx.sqlite:sqlite-ktx:2.3.1") + implementation("com.github.requery:sqlite-android:3.41.1") implementation("com.github.inorichi.storio:storio-common:8be19de@aar") implementation("com.github.inorichi.storio:storio-sqlite:8be19de@aar") @@ -241,7 +240,7 @@ dependencies { implementation("com.github.inorichi.injekt:injekt-core:65b0440") // Image library - val coilVersion = "2.1.0" + val coilVersion = "2.3.0" implementation("io.coil-kt:coil:$coilVersion") implementation("io.coil-kt:coil-gif:$coilVersion") implementation("io.coil-kt:coil-svg:$coilVersion") @@ -281,14 +280,14 @@ dependencies { implementation(kotlin("stdlib", org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)) - val coroutines = "1.5.1" + val coroutines = "1.7.0" implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines") implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines") // Text distance implementation("info.debatty:java-string-similarity:2.0.0") - implementation("com.google.android.gms:play-services-oss-licenses:17.0.0") + implementation("com.google.android.gms:play-services-oss-licenses:17.0.1") // TLS 1.3 support for Android < 10 implementation("org.conscrypt:conscrypt-android:2.5.2") diff --git a/app/progaurd-android-optimize.txt b/app/progaurd-android-optimize.txt index ad490a86c4..9f53403165 100644 --- a/app/progaurd-android-optimize.txt +++ b/app/progaurd-android-optimize.txt @@ -1,5 +1,5 @@ --allowaccessmodification -dontusemixedcaseclassnames +-ignorewarnings -verbose -keepattributes *Annotation* diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index dc0245d2ac..bb9bdd9fc9 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -6,6 +6,7 @@ -keep,allowoptimization class androidx.preference.** { *; } -keep,allowoptimization class kotlin.** { public protected *; } -keep,allowoptimization class kotlinx.coroutines.** { public protected *; } +-keep class kotlinx.serialization.** { public protected *; } -keep,allowoptimization class okhttp3.** { public protected *; } -keep,allowoptimization class okio.** { public protected *; } -keep,allowoptimization class rx.** { public protected *; } @@ -14,6 +15,10 @@ -keep,allowoptimization class app.cash.quickjs.** { public protected *; } -keep,allowoptimization class uy.kohesive.injekt.** { public protected *; } -keep,allowoptimization class eu.davidea.flexibleadapter.** { public protected *; } +-keep class androidx.window.** { *; } +-dontwarn androidx.window.** +-keep class org.slf4j.** { *; } +-dontwarn org.slf4j.** # Design library -dontwarn com.google.android.material.** @@ -21,6 +26,14 @@ -keep interface com.google.android.material.** { *; } -keep public class com.google.android.material.R$* { *; } +# From extensions-lib +-keep,allowoptimization class eu.kanade.tachiyomi.network.interceptor.RateLimitInterceptorKt { public protected *; } +-keep,allowoptimization class eu.kanade.tachiyomi.network.interceptor.SpecificHostRateLimitInterceptorKt { public protected *; } +-keep,allowoptimization class eu.kanade.tachiyomi.network.NetworkHelper { public protected *; } +-keep,allowoptimization class eu.kanade.tachiyomi.network.OkHttpExtensionsKt { public protected *; } +-keep,allowoptimization class eu.kanade.tachiyomi.network.RequestsKt { public protected *; } +-keep,allowoptimization class eu.kanade.tachiyomi.AppInfo { public protected *; } + -keep class com.hippo.image.** { *; } -keep interface com.hippo.image.** { *; } -dontwarn nucleus.view.NucleusActionBarActivity @@ -68,11 +81,11 @@ kotlinx.serialization.KSerializer serializer(...); } --keep,includedescriptorclasses class eu.kanade.tachiyomi.**$$serializer { *; } --keepclassmembers class eu.kanade.tachiyomi.** { +-keep,includedescriptorclasses class eu.kanade.**$$serializer { *; } +-keepclassmembers class eu.kanade.** { *** Companion; } --keepclasseswithmembers class eu.kanade.tachiyomi.** { +-keepclasseswithmembers class eu.kanade.** { kotlinx.serialization.KSerializer serializer(...); }