Update proguard-rules Rhino 1.8.0

Xwite · Jan 6, 2025 · 9609781 · 9609781
1 parent cfb8816
commit 9609781
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -226,6 +226,25 @@
 ### 以下内容是更新rhino1.7.14.jar后IDE提示添加的
 -dontwarn java.beans.**
 -dontwarn javax.script.**
+### 以下内容是更新rhino1.8.0.jar后IDE提示添加的
+-dontwarn jdk.dynalink.CallSiteDescriptor
+-dontwarn jdk.dynalink.DynamicLinker
+-dontwarn jdk.dynalink.DynamicLinkerFactory
+-dontwarn jdk.dynalink.NamedOperation
+-dontwarn jdk.dynalink.Namespace
+-dontwarn jdk.dynalink.NamespaceOperation
+-dontwarn jdk.dynalink.Operation
+-dontwarn jdk.dynalink.RelinkableCallSite
+-dontwarn jdk.dynalink.StandardNamespace
+-dontwarn jdk.dynalink.StandardOperation
+-dontwarn jdk.dynalink.linker.GuardedInvocation
+-dontwarn jdk.dynalink.linker.GuardingDynamicLinker
+-dontwarn jdk.dynalink.linker.LinkRequest
+-dontwarn jdk.dynalink.linker.LinkerServices
+-dontwarn jdk.dynalink.linker.TypeBasedGuardingDynamicLinker
+-dontwarn jdk.dynalink.linker.support.CompositeTypeBasedGuardingDynamicLinker
+-dontwarn jdk.dynalink.linker.support.Guards
+-dontwarn jdk.dynalink.support.ChainedCallSite
 
 ## EPUB
 -dontwarn nl.siegmann.epublib.**

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -37,7 +37,7 @@ protobufJavalite = "4.26.1"
 quickChineseTransfer = "0.2.13"
 room = "2.6.1"
 splitties = "3.0.0"
-rhino = "1.7.15"
+rhino = "1.8.0"
 desugar = "2.0.4"
 
 activity = "1.9.1"

diff --git a/modules/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt b/modules/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt
@@ -313,8 +313,8 @@ object RhinoScriptEngine : AbstractScriptEngine(), Invocable, Compilable {
 
             override fun makeContext(): Context {
                 val cx = RhinoContext(this)
-                cx.languageVersion = 200
-                cx.optimizationLevel = -1
+                cx.languageVersion = Context.VERSION_ES6
+                cx.interpretedMode = true
                 cx.setClassShutter(RhinoClassShutter)
                 cx.wrapFactory = RhinoWrapFactory
                 cx.instructionObserverThreshold = 10000