From 70b10c18d62436ce2dde13d28f2cc447267068d6 Mon Sep 17 00:00:00 2001 From: MEFRREEX Date: Tue, 19 Aug 2025 07:55:24 +0400 Subject: [PATCH 1/2] refactor: create subpackages for graalvm and rhino js implementations --- docs/examples/using_scriptify.md | 4 ++-- .../scriptify/{ => js/graalvm}/script/JsFunction.java | 2 +- .../scriptify/{ => js/graalvm}/script/JsScript.java | 2 +- .../{ => js/graalvm}/script/JsSecurityClassAccessor.java | 2 +- .../scriptify/{ => js/rhino}/script/JsFunction.java | 2 +- .../instancify/scriptify/{ => js/rhino}/script/JsScript.java | 2 +- .../{ => js/rhino}/script/JsSecurityClassAccessor.java | 2 +- .../scriptify/{ => js/rhino}/script/JsWrapFactory.java | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename script-js-graalvm/src/main/java/com/instancify/scriptify/{ => js/graalvm}/script/JsFunction.java (98%) rename script-js-graalvm/src/main/java/com/instancify/scriptify/{ => js/graalvm}/script/JsScript.java (98%) rename script-js-graalvm/src/main/java/com/instancify/scriptify/{ => js/graalvm}/script/JsSecurityClassAccessor.java (97%) rename script-js-rhino/src/main/java/com/instancify/scriptify/{ => js/rhino}/script/JsFunction.java (98%) rename script-js-rhino/src/main/java/com/instancify/scriptify/{ => js/rhino}/script/JsScript.java (98%) rename script-js-rhino/src/main/java/com/instancify/scriptify/{ => js/rhino}/script/JsSecurityClassAccessor.java (97%) rename script-js-rhino/src/main/java/com/instancify/scriptify/{ => js/rhino}/script/JsWrapFactory.java (93%) diff --git a/docs/examples/using_scriptify.md b/docs/examples/using_scriptify.md index ca4451c..ce35453 100644 --- a/docs/examples/using_scriptify.md +++ b/docs/examples/using_scriptify.md @@ -12,9 +12,9 @@ implementation "com.instancify.scriptify:script-js-rhino:1.3.0-SNAPSHOT" ``` ___ -Running the script: +Running the script (GraalVM): ```java -import com.instancify.scriptify.script.JsScript; +import com.instancify.scriptify.js.graalvm.script.JsScript; import com.instancify.scriptify.core.script.constant.StandardConstantManager; import com.instancify.scriptify.core.script.function.StandardFunctionManager; import com.instancify.scriptify.api.exception.ScriptException; diff --git a/script-js-graalvm/src/main/java/com/instancify/scriptify/script/JsFunction.java b/script-js-graalvm/src/main/java/com/instancify/scriptify/js/graalvm/script/JsFunction.java similarity index 98% rename from script-js-graalvm/src/main/java/com/instancify/scriptify/script/JsFunction.java rename to script-js-graalvm/src/main/java/com/instancify/scriptify/js/graalvm/script/JsFunction.java index 6323f8f..8a744fc 100644 --- a/script-js-graalvm/src/main/java/com/instancify/scriptify/script/JsFunction.java +++ b/script-js-graalvm/src/main/java/com/instancify/scriptify/js/graalvm/script/JsFunction.java @@ -1,4 +1,4 @@ -package com.instancify.scriptify.script; +package com.instancify.scriptify.js.graalvm.script; import com.instancify.scriptify.api.exception.ScriptFunctionException; import com.instancify.scriptify.api.script.Script; diff --git a/script-js-graalvm/src/main/java/com/instancify/scriptify/script/JsScript.java b/script-js-graalvm/src/main/java/com/instancify/scriptify/js/graalvm/script/JsScript.java similarity index 98% rename from script-js-graalvm/src/main/java/com/instancify/scriptify/script/JsScript.java rename to script-js-graalvm/src/main/java/com/instancify/scriptify/js/graalvm/script/JsScript.java index 0b18261..ab9968d 100644 --- a/script-js-graalvm/src/main/java/com/instancify/scriptify/script/JsScript.java +++ b/script-js-graalvm/src/main/java/com/instancify/scriptify/js/graalvm/script/JsScript.java @@ -1,4 +1,4 @@ -package com.instancify.scriptify.script; +package com.instancify.scriptify.js.graalvm.script; import com.instancify.scriptify.api.exception.ScriptException; import com.instancify.scriptify.api.script.Script; diff --git a/script-js-graalvm/src/main/java/com/instancify/scriptify/script/JsSecurityClassAccessor.java b/script-js-graalvm/src/main/java/com/instancify/scriptify/js/graalvm/script/JsSecurityClassAccessor.java similarity index 97% rename from script-js-graalvm/src/main/java/com/instancify/scriptify/script/JsSecurityClassAccessor.java rename to script-js-graalvm/src/main/java/com/instancify/scriptify/js/graalvm/script/JsSecurityClassAccessor.java index 3b37f57..d6d254d 100644 --- a/script-js-graalvm/src/main/java/com/instancify/scriptify/script/JsSecurityClassAccessor.java +++ b/script-js-graalvm/src/main/java/com/instancify/scriptify/js/graalvm/script/JsSecurityClassAccessor.java @@ -1,4 +1,4 @@ -package com.instancify.scriptify.script; +package com.instancify.scriptify.js.graalvm.script; import com.instancify.scriptify.api.script.security.SecurityClassAccessor; import com.instancify.scriptify.api.script.security.exclude.ClassSecurityExclude; diff --git a/script-js-rhino/src/main/java/com/instancify/scriptify/script/JsFunction.java b/script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsFunction.java similarity index 98% rename from script-js-rhino/src/main/java/com/instancify/scriptify/script/JsFunction.java rename to script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsFunction.java index d1b1628..8b065aa 100644 --- a/script-js-rhino/src/main/java/com/instancify/scriptify/script/JsFunction.java +++ b/script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsFunction.java @@ -1,4 +1,4 @@ -package com.instancify.scriptify.script; +package com.instancify.scriptify.js.rhino.script; import com.instancify.scriptify.api.exception.ScriptFunctionException; import com.instancify.scriptify.api.script.Script; diff --git a/script-js-rhino/src/main/java/com/instancify/scriptify/script/JsScript.java b/script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsScript.java similarity index 98% rename from script-js-rhino/src/main/java/com/instancify/scriptify/script/JsScript.java rename to script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsScript.java index bda70dd..be474f7 100644 --- a/script-js-rhino/src/main/java/com/instancify/scriptify/script/JsScript.java +++ b/script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsScript.java @@ -1,4 +1,4 @@ -package com.instancify.scriptify.script; +package com.instancify.scriptify.js.rhino.script; import com.instancify.scriptify.api.exception.ScriptException; import com.instancify.scriptify.api.script.Script; diff --git a/script-js-rhino/src/main/java/com/instancify/scriptify/script/JsSecurityClassAccessor.java b/script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsSecurityClassAccessor.java similarity index 97% rename from script-js-rhino/src/main/java/com/instancify/scriptify/script/JsSecurityClassAccessor.java rename to script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsSecurityClassAccessor.java index a6f1092..f9b6a24 100644 --- a/script-js-rhino/src/main/java/com/instancify/scriptify/script/JsSecurityClassAccessor.java +++ b/script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsSecurityClassAccessor.java @@ -1,4 +1,4 @@ -package com.instancify.scriptify.script; +package com.instancify.scriptify.js.rhino.script; import com.instancify.scriptify.api.script.security.SecurityClassAccessor; import com.instancify.scriptify.api.script.security.exclude.ClassSecurityExclude; diff --git a/script-js-rhino/src/main/java/com/instancify/scriptify/script/JsWrapFactory.java b/script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsWrapFactory.java similarity index 93% rename from script-js-rhino/src/main/java/com/instancify/scriptify/script/JsWrapFactory.java rename to script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsWrapFactory.java index c79e39b..163f252 100644 --- a/script-js-rhino/src/main/java/com/instancify/scriptify/script/JsWrapFactory.java +++ b/script-js-rhino/src/main/java/com/instancify/scriptify/js/rhino/script/JsWrapFactory.java @@ -1,4 +1,4 @@ -package com.instancify.scriptify.script; +package com.instancify.scriptify.js.rhino.script; import com.instancify.scriptify.api.script.ScriptObject; import org.mozilla.javascript.Context; From 01f748db5ba64f9934734fc1cc21a170285cf042 Mon Sep 17 00:00:00 2001 From: MEFRREEX Date: Tue, 19 Aug 2025 07:55:49 +0400 Subject: [PATCH 2/2] chore: bump version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index b428289..f1156d3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ java { allprojects { group = "com.instancify.scriptify" - version = "1.4.1-SNAPSHOT" + version = "1.4.2-SNAPSHOT" } subprojects {