From 7801456d17247fc61a83ee36634a45e326152a45 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 18 Nov 2023 15:12:18 +0200 Subject: [PATCH] Enable desugaring to fit Jsoup requirements #553 --- app/build.gradle | 10 ++++++---- app/proguard-rules.pro | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d05b9dfe2..496a362b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,11 +47,12 @@ android { main.java.srcDirs += 'src/main/kotlin/' } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + coreLibraryDesugaringEnabled true + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17.toString() + jvmTarget = JavaVersion.VERSION_1_8.toString() freeCompilerArgs += [ '-opt-in=kotlin.ExperimentalStdlibApi', '-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi', @@ -81,10 +82,11 @@ afterEvaluate { } dependencies { //noinspection GradleDependency - implementation('com.github.KotatsuApp:kotatsu-parsers:43fd7b8d47') { + implementation('com.github.KotatsuApp:kotatsu-parsers:41eea1c420') { exclude group: 'org.json', module: 'json' } + coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4' implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.20' implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 9b85e952b..a7e0e91ee 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -20,3 +20,4 @@ -keep class org.koitharu.kotatsu.core.prefs.ScreenshotsPolicy { *; } -keep class org.koitharu.kotatsu.settings.backup.PeriodicalBackupSettingsFragment { *; } -keep class org.jsoup.parser.Tag +-keep class org.jsoup.internal.StringUtil