From df0122c1464d82881bf9365559ef6471d43f6802 Mon Sep 17 00:00:00 2001 From: IndusAryan <125901294+IndusAryan@users.noreply.github.com> Date: Sat, 18 Nov 2023 20:01:41 +0530 Subject: [PATCH] fix: bump rhino js and upgrade desugaring level (#774) * fix and bump rhino js * upgrade desugaring level * uppercase run to Run --- app/build.gradle.kts | 8 +++----- app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt | 2 ++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 8e1798d8..79332f1f 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -210,15 +210,13 @@ dependencies { implementation("com.github.discord:OverlappingPanels:0.1.5") // Gestures implementation("com.github.rubensousa:previewseekbar-media3:1.1.1.0") // SeekBar Preview - // Extensionns & Other Libs - implementation("org.mozilla:rhino:1.7.13") /* run JS - ^ Don't Bump RhinoJS to 1.7.14, since in 1.7.14 Rhino Uses the `SourceVersion` Class, Which is NOT - Available on Android (even with Desugaring) & `NoClassDefFoundError` Occurs. */ + // Extensions & Other Libs + implementation("org.mozilla:rhino:1.7.14") // Run JavaScript implementation("me.xdrop:fuzzywuzzy:1.4.0") // Library/Ext Searching with Levenshtein Distance implementation("com.github.LagradOst:SafeFile:0.0.5") // To Prevent the URI File Fu*kery implementation("org.conscrypt:conscrypt-android:2.5.2") // To Fix SSL Fu*kery on Android 9 implementation("com.uwetrottmann.tmdb2:tmdb-java:2.10.0") // TMDB API v3 Wrapper Made with RetroFit - coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.1.6") + coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.1") /* JSON Parser ^ Don't Bump Jackson above 2.13.1 , Crashes on Android TV's and FireSticks that have Min API Level 25 or Less. */ diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt index 35a628a3..7e3b4851 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.databind.DeserializationFeature import com.fasterxml.jackson.databind.json.JsonMapper import com.fasterxml.jackson.module.kotlin.KotlinModule +import com.google.errorprone.annotations.Keep import com.lagradost.cloudstream3.mvvm.logError import com.lagradost.cloudstream3.mvvm.normalSafeApiCall import com.lagradost.cloudstream3.syncproviders.AccountManager.Companion.aniListApi @@ -806,6 +807,7 @@ fun fixTitle(str: String): String { * Make sure you get the scope using: val scope: Scriptable = rhino.initSafeStandardObjects() * Use like the following: rhino.evaluateString(scope, js, "JavaScript", 1, null) **/ +@Keep suspend fun getRhinoContext(): org.mozilla.javascript.Context { return Coroutines.mainWork { val rhino = org.mozilla.javascript.Context.enter()