From cab4d4759cc95e505debd29d1152bd4e31ffa4b0 Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Sun, 6 Apr 2025 12:51:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/proguard-rules.pro           | 31 ---------------------------
 modules/rhino/consumer-rules.pro | 36 +++++++++++++++++++++++++-------
 2 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 9699d081b..9813dc3d8 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -243,37 +243,6 @@ cn.hutool.core.**{*;}
 -keep class sun.reflect.**{*;}
 -dontwarn sun.reflect.**
 
-## Rhino
--keep class
-!org.mozilla.javascript.ast.**,
-!org.mozilla.javascript.commonjs.**,
-!org.mozilla.javascript.optimizer.**,
-!org.mozilla.javascript.serialize.**,
-org.mozilla.javascript.** { *; }
--dontwarn org.mozilla.javascript.engine.RhinoScriptEngineFactory
-### 以下内容是更新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
-
 -keepclassmembers class * {
     public <init> (org.json.JSONObject);
 }
diff --git a/modules/rhino/consumer-rules.pro b/modules/rhino/consumer-rules.pro
index f944efb63..137447180 100644
--- a/modules/rhino/consumer-rules.pro
+++ b/modules/rhino/consumer-rules.pro
@@ -21,11 +21,33 @@
 #-renamesourcefileattribute SourceFile
 
 ## Rhino
--keep class com.script.** { *; }
--keep class javax.script.** { *; }
--keep class java.lang.** { *; }
--keep class java.util.function.** { *; }
--keep class com.sun.script.javascript.** { *; }
--keep class org.mozilla.** { *; }
+-keep class
+!org.mozilla.javascript.ast.**,
+!org.mozilla.javascript.commonjs.**,
+!org.mozilla.javascript.optimizer.**,
+!org.mozilla.javascript.serialize.**,
+org.mozilla.javascript.** { *; }
 
--dontwarn org.mozilla.javascript.engine.RhinoScriptEngineFactory
\ No newline at end of file
+-dontwarn org.mozilla.javascript.engine.RhinoScriptEngineFactory
+### 以下内容是更新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