diff --git a/app/build.gradle b/app/build.gradle index 22b07da21..2756a90d8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -219,9 +219,9 @@ dependencies { implementation(libs.json.path) implementation(libs.jsoupxpath) implementation(project(path: ':modules:book')) + implementation implementation(project(path: ':modules:rhino')) //JS rhino - implementation(project(path: ':modules:rhino1.7.3')) //网络 implementation(libs.okhttp) diff --git a/modules/rhino1.7.3/build.gradle b/modules/rhino/build.gradle similarity index 93% rename from modules/rhino1.7.3/build.gradle rename to modules/rhino/build.gradle index 2a30a1545..1890ee4d5 100644 --- a/modules/rhino1.7.3/build.gradle +++ b/modules/rhino/build.gradle @@ -35,7 +35,7 @@ android { } dependencies { - api(fileTree(dir: 'lib', include: ['rhino-1.7.13-2.jar'])) + api(fileTree(dir: 'lib', include: ['rhino-1.7.14.jar'])) implementation(libs.kotlinx.coroutines.core) diff --git a/modules/rhino1.7.3/consumer-rules.pro b/modules/rhino/consumer-rules.pro similarity index 100% rename from modules/rhino1.7.3/consumer-rules.pro rename to modules/rhino/consumer-rules.pro diff --git a/modules/rhino/lib/rhino-1.7.14.jar b/modules/rhino/lib/rhino-1.7.14.jar new file mode 100644 index 000000000..3c4e55ca3 Binary files /dev/null and b/modules/rhino/lib/rhino-1.7.14.jar differ diff --git a/modules/rhino1.7.3/src/main/AndroidManifest.xml b/modules/rhino/src/main/AndroidManifest.xml similarity index 100% rename from modules/rhino1.7.3/src/main/AndroidManifest.xml rename to modules/rhino/src/main/AndroidManifest.xml diff --git a/modules/rhino1.7.3/src/main/java/com/script/AbstractScriptEngine.kt b/modules/rhino/src/main/java/com/script/AbstractScriptEngine.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/AbstractScriptEngine.kt rename to modules/rhino/src/main/java/com/script/AbstractScriptEngine.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/Bindings.kt b/modules/rhino/src/main/java/com/script/Bindings.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/Bindings.kt rename to modules/rhino/src/main/java/com/script/Bindings.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/Compilable.kt b/modules/rhino/src/main/java/com/script/Compilable.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/Compilable.kt rename to modules/rhino/src/main/java/com/script/Compilable.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/CompiledScript.kt b/modules/rhino/src/main/java/com/script/CompiledScript.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/CompiledScript.kt rename to modules/rhino/src/main/java/com/script/CompiledScript.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/Invocable.kt b/modules/rhino/src/main/java/com/script/Invocable.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/Invocable.kt rename to modules/rhino/src/main/java/com/script/Invocable.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/RhinoContextFactory.kt b/modules/rhino/src/main/java/com/script/RhinoContextFactory.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/RhinoContextFactory.kt rename to modules/rhino/src/main/java/com/script/RhinoContextFactory.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/ScriptContext.kt b/modules/rhino/src/main/java/com/script/ScriptContext.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/ScriptContext.kt rename to modules/rhino/src/main/java/com/script/ScriptContext.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/ScriptEngine.kt b/modules/rhino/src/main/java/com/script/ScriptEngine.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/ScriptEngine.kt rename to modules/rhino/src/main/java/com/script/ScriptEngine.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/ScriptException.kt b/modules/rhino/src/main/java/com/script/ScriptException.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/ScriptException.kt rename to modules/rhino/src/main/java/com/script/ScriptException.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/SimpleBindings.kt b/modules/rhino/src/main/java/com/script/SimpleBindings.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/SimpleBindings.kt rename to modules/rhino/src/main/java/com/script/SimpleBindings.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/SimpleScriptContext.kt b/modules/rhino/src/main/java/com/script/SimpleScriptContext.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/SimpleScriptContext.kt rename to modules/rhino/src/main/java/com/script/SimpleScriptContext.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/ExternalScriptable.kt b/modules/rhino/src/main/java/com/script/rhino/ExternalScriptable.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/rhino/ExternalScriptable.kt rename to modules/rhino/src/main/java/com/script/rhino/ExternalScriptable.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/InterfaceImplementor.kt b/modules/rhino/src/main/java/com/script/rhino/InterfaceImplementor.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/rhino/InterfaceImplementor.kt rename to modules/rhino/src/main/java/com/script/rhino/InterfaceImplementor.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/JSAdapter.kt b/modules/rhino/src/main/java/com/script/rhino/JSAdapter.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/rhino/JSAdapter.kt rename to modules/rhino/src/main/java/com/script/rhino/JSAdapter.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/JavaAdapter.kt b/modules/rhino/src/main/java/com/script/rhino/JavaAdapter.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/rhino/JavaAdapter.kt rename to modules/rhino/src/main/java/com/script/rhino/JavaAdapter.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoClassShutter.kt b/modules/rhino/src/main/java/com/script/rhino/RhinoClassShutter.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoClassShutter.kt rename to modules/rhino/src/main/java/com/script/rhino/RhinoClassShutter.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoCompiledScript.kt b/modules/rhino/src/main/java/com/script/rhino/RhinoCompiledScript.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoCompiledScript.kt rename to modules/rhino/src/main/java/com/script/rhino/RhinoCompiledScript.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoContext.kt b/modules/rhino/src/main/java/com/script/rhino/RhinoContext.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoContext.kt rename to modules/rhino/src/main/java/com/script/rhino/RhinoContext.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoInterruptedError.kt b/modules/rhino/src/main/java/com/script/rhino/RhinoInterruptedError.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoInterruptedError.kt rename to modules/rhino/src/main/java/com/script/rhino/RhinoInterruptedError.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoScriptEngine.kt b/modules/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoScriptEngine.kt rename to modules/rhino/src/main/java/com/script/rhino/RhinoScriptEngine.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoTopLevel.kt b/modules/rhino/src/main/java/com/script/rhino/RhinoTopLevel.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoTopLevel.kt rename to modules/rhino/src/main/java/com/script/rhino/RhinoTopLevel.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoWrapFactory.kt b/modules/rhino/src/main/java/com/script/rhino/RhinoWrapFactory.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoWrapFactory.kt rename to modules/rhino/src/main/java/com/script/rhino/RhinoWrapFactory.kt diff --git a/modules/rhino1.7.3/src/main/java/com/script/rhino/VMBridgeReflect.kt b/modules/rhino/src/main/java/com/script/rhino/VMBridgeReflect.kt similarity index 100% rename from modules/rhino1.7.3/src/main/java/com/script/rhino/VMBridgeReflect.kt rename to modules/rhino/src/main/java/com/script/rhino/VMBridgeReflect.kt diff --git a/modules/rhino1.7.3/.gitignore b/modules/rhino1.7.3/.gitignore deleted file mode 100644 index 42afabfd2..000000000 --- a/modules/rhino1.7.3/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/modules/rhino1.7.3/lib/rhino-1.7.13-2.jar b/modules/rhino1.7.3/lib/rhino-1.7.13-2.jar deleted file mode 100644 index fa8998f93..000000000 Binary files a/modules/rhino1.7.3/lib/rhino-1.7.13-2.jar and /dev/null differ diff --git a/settings.gradle b/settings.gradle index 68253c064..b69768276 100644 --- a/settings.gradle +++ b/settings.gradle @@ -49,4 +49,4 @@ rootProject.name = 'legado' include ':app' include ':modules:book' -include ':modules:rhino1.7.3' \ No newline at end of file +include ':modules:rhino' \ No newline at end of file