diff --git a/app/build.gradle b/app/build.gradle index ae92561e9..442e49975 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -206,9 +206,9 @@ dependencies { implementation(project(path: ':modules:book')) //JS rhino - appImplementation(project(path: ':modules:rhino1.4')) - googleImplementation(project(path: ':modules:rhino1.4')) - lollipopImplementation(project(path: ':modules:rhino1.3')) + appImplementation(project(path: ':modules:rhino1.7.4')) + googleImplementation(project(path: ':modules:rhino1.7.4')) + lollipopImplementation(project(path: ':modules:rhino1.7.3')) //网络 implementation('com.squareup.okhttp3:okhttp:4.10.0') diff --git a/modules/rhino1.3/.gitignore b/modules/rhino1.7.3/.gitignore similarity index 100% rename from modules/rhino1.3/.gitignore rename to modules/rhino1.7.3/.gitignore diff --git a/modules/rhino1.3/build.gradle b/modules/rhino1.7.3/build.gradle similarity index 100% rename from modules/rhino1.3/build.gradle rename to modules/rhino1.7.3/build.gradle diff --git a/modules/rhino1.3/consumer-rules.pro b/modules/rhino1.7.3/consumer-rules.pro similarity index 100% rename from modules/rhino1.3/consumer-rules.pro rename to modules/rhino1.7.3/consumer-rules.pro diff --git a/modules/rhino1.3/lib/rhino-1.7.13-2.jar b/modules/rhino1.7.3/lib/rhino-1.7.13-2.jar similarity index 100% rename from modules/rhino1.3/lib/rhino-1.7.13-2.jar rename to modules/rhino1.7.3/lib/rhino-1.7.13-2.jar diff --git a/modules/rhino1.3/src/main/AndroidManifest.xml b/modules/rhino1.7.3/src/main/AndroidManifest.xml similarity index 100% rename from modules/rhino1.3/src/main/AndroidManifest.xml rename to modules/rhino1.7.3/src/main/AndroidManifest.xml diff --git a/modules/rhino1.3/src/main/java/com/script/AbstractScriptEngine.kt b/modules/rhino1.7.3/src/main/java/com/script/AbstractScriptEngine.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/AbstractScriptEngine.kt rename to modules/rhino1.7.3/src/main/java/com/script/AbstractScriptEngine.kt diff --git a/modules/rhino1.3/src/main/java/com/script/Bindings.kt b/modules/rhino1.7.3/src/main/java/com/script/Bindings.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/Bindings.kt rename to modules/rhino1.7.3/src/main/java/com/script/Bindings.kt diff --git a/modules/rhino1.3/src/main/java/com/script/Compilable.kt b/modules/rhino1.7.3/src/main/java/com/script/Compilable.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/Compilable.kt rename to modules/rhino1.7.3/src/main/java/com/script/Compilable.kt diff --git a/modules/rhino1.3/src/main/java/com/script/CompiledScript.kt b/modules/rhino1.7.3/src/main/java/com/script/CompiledScript.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/CompiledScript.kt rename to modules/rhino1.7.3/src/main/java/com/script/CompiledScript.kt diff --git a/modules/rhino1.3/src/main/java/com/script/Invocable.kt b/modules/rhino1.7.3/src/main/java/com/script/Invocable.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/Invocable.kt rename to modules/rhino1.7.3/src/main/java/com/script/Invocable.kt diff --git a/modules/rhino1.3/src/main/java/com/script/ScriptContext.kt b/modules/rhino1.7.3/src/main/java/com/script/ScriptContext.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/ScriptContext.kt rename to modules/rhino1.7.3/src/main/java/com/script/ScriptContext.kt diff --git a/modules/rhino1.3/src/main/java/com/script/ScriptEngine.kt b/modules/rhino1.7.3/src/main/java/com/script/ScriptEngine.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/ScriptEngine.kt rename to modules/rhino1.7.3/src/main/java/com/script/ScriptEngine.kt diff --git a/modules/rhino1.3/src/main/java/com/script/ScriptException.kt b/modules/rhino1.7.3/src/main/java/com/script/ScriptException.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/ScriptException.kt rename to modules/rhino1.7.3/src/main/java/com/script/ScriptException.kt diff --git a/modules/rhino1.3/src/main/java/com/script/SimpleBindings.kt b/modules/rhino1.7.3/src/main/java/com/script/SimpleBindings.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/SimpleBindings.kt rename to modules/rhino1.7.3/src/main/java/com/script/SimpleBindings.kt diff --git a/modules/rhino1.3/src/main/java/com/script/SimpleScriptContext.kt b/modules/rhino1.7.3/src/main/java/com/script/SimpleScriptContext.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/SimpleScriptContext.kt rename to modules/rhino1.7.3/src/main/java/com/script/SimpleScriptContext.kt diff --git a/modules/rhino1.3/src/main/java/com/script/rhino/ExternalScriptable.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/ExternalScriptable.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/rhino/ExternalScriptable.kt rename to modules/rhino1.7.3/src/main/java/com/script/rhino/ExternalScriptable.kt diff --git a/modules/rhino1.3/src/main/java/com/script/rhino/InterfaceImplementor.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/InterfaceImplementor.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/rhino/InterfaceImplementor.kt rename to modules/rhino1.7.3/src/main/java/com/script/rhino/InterfaceImplementor.kt diff --git a/modules/rhino1.3/src/main/java/com/script/rhino/JSAdapter.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/JSAdapter.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/rhino/JSAdapter.kt rename to modules/rhino1.7.3/src/main/java/com/script/rhino/JSAdapter.kt diff --git a/modules/rhino1.3/src/main/java/com/script/rhino/JavaAdapter.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/JavaAdapter.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/rhino/JavaAdapter.kt rename to modules/rhino1.7.3/src/main/java/com/script/rhino/JavaAdapter.kt diff --git a/modules/rhino1.3/src/main/java/com/script/rhino/RhinoClassShutter.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoClassShutter.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/rhino/RhinoClassShutter.kt rename to modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoClassShutter.kt diff --git a/modules/rhino1.3/src/main/java/com/script/rhino/RhinoCompiledScript.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoCompiledScript.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/rhino/RhinoCompiledScript.kt rename to modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoCompiledScript.kt diff --git a/modules/rhino1.3/src/main/java/com/script/rhino/RhinoScriptEngine.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoScriptEngine.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/rhino/RhinoScriptEngine.kt rename to modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoScriptEngine.kt diff --git a/modules/rhino1.3/src/main/java/com/script/rhino/RhinoTopLevel.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoTopLevel.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/rhino/RhinoTopLevel.kt rename to modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoTopLevel.kt diff --git a/modules/rhino1.3/src/main/java/com/script/rhino/RhinoWrapFactory.kt b/modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoWrapFactory.kt similarity index 100% rename from modules/rhino1.3/src/main/java/com/script/rhino/RhinoWrapFactory.kt rename to modules/rhino1.7.3/src/main/java/com/script/rhino/RhinoWrapFactory.kt diff --git a/modules/rhino1.4/.gitignore b/modules/rhino1.7.4/.gitignore similarity index 100% rename from modules/rhino1.4/.gitignore rename to modules/rhino1.7.4/.gitignore diff --git a/modules/rhino1.4/build.gradle b/modules/rhino1.7.4/build.gradle similarity index 100% rename from modules/rhino1.4/build.gradle rename to modules/rhino1.7.4/build.gradle diff --git a/modules/rhino1.4/consumer-rules.pro b/modules/rhino1.7.4/consumer-rules.pro similarity index 100% rename from modules/rhino1.4/consumer-rules.pro rename to modules/rhino1.7.4/consumer-rules.pro diff --git a/modules/rhino1.4/lib/rhino-1.7.14-2.jar b/modules/rhino1.7.4/lib/rhino-1.7.14-2.jar similarity index 100% rename from modules/rhino1.4/lib/rhino-1.7.14-2.jar rename to modules/rhino1.7.4/lib/rhino-1.7.14-2.jar diff --git a/modules/rhino1.4/src/main/AndroidManifest.xml b/modules/rhino1.7.4/src/main/AndroidManifest.xml similarity index 100% rename from modules/rhino1.4/src/main/AndroidManifest.xml rename to modules/rhino1.7.4/src/main/AndroidManifest.xml diff --git a/modules/rhino1.4/src/main/java/com/script/AbstractScriptEngine.kt b/modules/rhino1.7.4/src/main/java/com/script/AbstractScriptEngine.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/AbstractScriptEngine.kt rename to modules/rhino1.7.4/src/main/java/com/script/AbstractScriptEngine.kt diff --git a/modules/rhino1.4/src/main/java/com/script/Bindings.kt b/modules/rhino1.7.4/src/main/java/com/script/Bindings.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/Bindings.kt rename to modules/rhino1.7.4/src/main/java/com/script/Bindings.kt diff --git a/modules/rhino1.4/src/main/java/com/script/Compilable.kt b/modules/rhino1.7.4/src/main/java/com/script/Compilable.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/Compilable.kt rename to modules/rhino1.7.4/src/main/java/com/script/Compilable.kt diff --git a/modules/rhino1.4/src/main/java/com/script/CompiledScript.kt b/modules/rhino1.7.4/src/main/java/com/script/CompiledScript.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/CompiledScript.kt rename to modules/rhino1.7.4/src/main/java/com/script/CompiledScript.kt diff --git a/modules/rhino1.4/src/main/java/com/script/Invocable.kt b/modules/rhino1.7.4/src/main/java/com/script/Invocable.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/Invocable.kt rename to modules/rhino1.7.4/src/main/java/com/script/Invocable.kt diff --git a/modules/rhino1.4/src/main/java/com/script/ScriptContext.kt b/modules/rhino1.7.4/src/main/java/com/script/ScriptContext.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/ScriptContext.kt rename to modules/rhino1.7.4/src/main/java/com/script/ScriptContext.kt diff --git a/modules/rhino1.4/src/main/java/com/script/ScriptEngine.kt b/modules/rhino1.7.4/src/main/java/com/script/ScriptEngine.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/ScriptEngine.kt rename to modules/rhino1.7.4/src/main/java/com/script/ScriptEngine.kt diff --git a/modules/rhino1.4/src/main/java/com/script/ScriptException.kt b/modules/rhino1.7.4/src/main/java/com/script/ScriptException.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/ScriptException.kt rename to modules/rhino1.7.4/src/main/java/com/script/ScriptException.kt diff --git a/modules/rhino1.4/src/main/java/com/script/SimpleBindings.kt b/modules/rhino1.7.4/src/main/java/com/script/SimpleBindings.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/SimpleBindings.kt rename to modules/rhino1.7.4/src/main/java/com/script/SimpleBindings.kt diff --git a/modules/rhino1.4/src/main/java/com/script/SimpleScriptContext.kt b/modules/rhino1.7.4/src/main/java/com/script/SimpleScriptContext.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/SimpleScriptContext.kt rename to modules/rhino1.7.4/src/main/java/com/script/SimpleScriptContext.kt diff --git a/modules/rhino1.4/src/main/java/com/script/rhino/ExternalScriptable.kt b/modules/rhino1.7.4/src/main/java/com/script/rhino/ExternalScriptable.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/rhino/ExternalScriptable.kt rename to modules/rhino1.7.4/src/main/java/com/script/rhino/ExternalScriptable.kt diff --git a/modules/rhino1.4/src/main/java/com/script/rhino/InterfaceImplementor.kt b/modules/rhino1.7.4/src/main/java/com/script/rhino/InterfaceImplementor.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/rhino/InterfaceImplementor.kt rename to modules/rhino1.7.4/src/main/java/com/script/rhino/InterfaceImplementor.kt diff --git a/modules/rhino1.4/src/main/java/com/script/rhino/JSAdapter.kt b/modules/rhino1.7.4/src/main/java/com/script/rhino/JSAdapter.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/rhino/JSAdapter.kt rename to modules/rhino1.7.4/src/main/java/com/script/rhino/JSAdapter.kt diff --git a/modules/rhino1.4/src/main/java/com/script/rhino/JavaAdapter.kt b/modules/rhino1.7.4/src/main/java/com/script/rhino/JavaAdapter.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/rhino/JavaAdapter.kt rename to modules/rhino1.7.4/src/main/java/com/script/rhino/JavaAdapter.kt diff --git a/modules/rhino1.4/src/main/java/com/script/rhino/RhinoClassShutter.kt b/modules/rhino1.7.4/src/main/java/com/script/rhino/RhinoClassShutter.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/rhino/RhinoClassShutter.kt rename to modules/rhino1.7.4/src/main/java/com/script/rhino/RhinoClassShutter.kt diff --git a/modules/rhino1.4/src/main/java/com/script/rhino/RhinoCompiledScript.kt b/modules/rhino1.7.4/src/main/java/com/script/rhino/RhinoCompiledScript.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/rhino/RhinoCompiledScript.kt rename to modules/rhino1.7.4/src/main/java/com/script/rhino/RhinoCompiledScript.kt diff --git a/modules/rhino1.4/src/main/java/com/script/rhino/RhinoScriptEngine.kt b/modules/rhino1.7.4/src/main/java/com/script/rhino/RhinoScriptEngine.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/rhino/RhinoScriptEngine.kt rename to modules/rhino1.7.4/src/main/java/com/script/rhino/RhinoScriptEngine.kt diff --git a/modules/rhino1.4/src/main/java/com/script/rhino/RhinoTopLevel.kt b/modules/rhino1.7.4/src/main/java/com/script/rhino/RhinoTopLevel.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/rhino/RhinoTopLevel.kt rename to modules/rhino1.7.4/src/main/java/com/script/rhino/RhinoTopLevel.kt diff --git a/modules/rhino1.4/src/main/java/com/script/rhino/RhinoWrapFactory.kt b/modules/rhino1.7.4/src/main/java/com/script/rhino/RhinoWrapFactory.kt similarity index 100% rename from modules/rhino1.4/src/main/java/com/script/rhino/RhinoWrapFactory.kt rename to modules/rhino1.7.4/src/main/java/com/script/rhino/RhinoWrapFactory.kt diff --git a/settings.gradle b/settings.gradle index 034a42cc2..e0f294513 100644 --- a/settings.gradle +++ b/settings.gradle @@ -30,5 +30,5 @@ rootProject.name = 'legado' include ':app' include ':modules:book' -include ':modules:rhino1.3' -include ':modules:rhino1.4' \ No newline at end of file +include ':modules:rhino1.7.3' +include ':modules:rhino1.7.4' \ No newline at end of file