From 2dd2054d4cde9f655a81418a9c5114630a9daf30 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 2 Jan 2022 11:25:23 -0500 Subject: [PATCH] Add QuickJS dependency to eventually replace Duktape (cherry picked from commit 2d03f3ce1e2ec320596837b2c3e23056f7b2eeb5) # Conflicts: # app/proguard-rules.pro --- app/build.gradle.kts | 2 ++ app/proguard-rules.pro | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9edb12f82..3361426e3 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -175,6 +175,8 @@ dependencies { implementation("org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$kotlinSerializationVersion") // JavaScript engine + implementation("app.cash.quickjs:quickjs-android:0.9.2") + // TODO: remove Duktape once all extensions are using QuickJS implementation("com.squareup.duktape:duktape-android:1.4.0") // HTML parser diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index b54053eef..5533fe4a9 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -69,17 +69,19 @@ # Keep extension's common dependencies -keep,allowoptimization class eu.kanade.tachiyomi.** { public protected *; } +-keep,allowoptimization class androidx.preference.** { *; } -keep,allowoptimization class kotlin.** { public protected *; } -keep,allowoptimization class kotlinx.coroutines.** { public protected *; } -keep,allowoptimization class okhttp3.** { public protected *; } +-keep,allowoptimization class okio.** { public protected *; } -keep,allowoptimization class rx.** { public protected *; } -keep,allowoptimization class org.jsoup.** { public protected *; } -keep,allowoptimization class com.google.gson.** { public protected *; } -keep,allowoptimization class com.github.salomonbrys.kotson.** { public protected *; } -keep,allowoptimization class com.squareup.duktape.** { public protected *; } --keep,allowoptimization class androidx.preference.** { *; } --keep,allowoptimization class okio.** { *; } --keep,allowoptimization class kotlinx.serialization.** { *; } +-keep,allowoptimization class app.cash.quickjs.** { public protected *; } +-keep,allowoptimization class uy.kohesive.injekt.** { public protected *; } +-keep,allowoptimization class kotlinx.serialization.** { public protected *; } # RxJava 1.1.0 -dontwarn sun.misc.**