diff --git a/.idea/artifacts/SpriteAssemblerApp.xml b/.idea/artifacts/SpriteAssemblerApp.xml index df5956686..ce8224e33 100644 --- a/.idea/artifacts/SpriteAssemblerApp.xml +++ b/.idea/artifacts/SpriteAssemblerApp.xml @@ -11,78 +11,78 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/TerrarumBuild.xml b/.idea/artifacts/TerrarumBuild.xml index 132031bbe..793cc2b9f 100644 --- a/.idea/artifacts/TerrarumBuild.xml +++ b/.idea/artifacts/TerrarumBuild.xml @@ -13,20 +13,10 @@ - - - - - - - - - - @@ -82,11 +72,21 @@ - - + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/graalvm_js_21_1_0_and_graalvm_js_scriptengine_21_1_0.xml b/.idea/libraries/graalvm_js_21_1_0_and_graalvm_js_scriptengine_21_1_0.xml deleted file mode 100644 index 8c02e125d..000000000 --- a/.idea/libraries/graalvm_js_21_1_0_and_graalvm_js_scriptengine_21_1_0.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/graalvm_js_22_3_1.xml b/.idea/libraries/graalvm_js_22_3_1.xml new file mode 100644 index 000000000..3854ecdf2 --- /dev/null +++ b/.idea/libraries/graalvm_js_22_3_1.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ModuleComputers/ModuleComputers.iml b/ModuleComputers/ModuleComputers.iml index f89613265..d069d1020 100644 --- a/ModuleComputers/ModuleComputers.iml +++ b/ModuleComputers/ModuleComputers.iml @@ -9,7 +9,7 @@ - + diff --git a/TerrarumBuild.iml b/TerrarumBuild.iml index 4c90f370e..11adfe1b7 100644 --- a/TerrarumBuild.iml +++ b/TerrarumBuild.iml @@ -18,7 +18,7 @@ - + diff --git a/lib/_create_graaljs_edit.md b/lib/_create_graaljs_edit.md new file mode 100644 index 000000000..bcdf87684 --- /dev/null +++ b/lib/_create_graaljs_edit.md @@ -0,0 +1,20 @@ +## How To Edit the Graaljs Jars + +0. Download following from Maven: + + org.graalvm.js:js:00.0.0 + org.graalvm.js:js-scriptengine:00.0.0 + +1. grab `js-00.0.0.jar` +2. on `META-INF/services/com.oracle.truffle.api.TruffleLanguage$Provider`, edit as shown: + + com.oracle.truffle.js.lang.JavaScriptLanguageProvider (existing line) + com.oracle.truffle.regex.RegexLanguageProvider (<< add this line) + +3. grab `regex-00.0.0.jar` +4. on `META-INF/services/com.oracle.truffle.api.TruffleLanguage$Provider`, edit as shown: + + com.oracle.truffle.regex.RegexLanguageProvider (existing line) + com.oracle.truffle.js.lang.JavaScriptLanguageProvider (<< add this line) + +5. Re-zip two files diff --git a/lib/graal-sdk-21.1.0-javadoc.jar b/lib/graal-sdk-21.1.0-javadoc.jar deleted file mode 100644 index 72baa0ea1..000000000 Binary files a/lib/graal-sdk-21.1.0-javadoc.jar and /dev/null differ diff --git a/lib/graal-sdk-21.1.0-sources.jar b/lib/graal-sdk-21.1.0-sources.jar deleted file mode 100644 index 0865d52b1..000000000 Binary files a/lib/graal-sdk-21.1.0-sources.jar and /dev/null differ diff --git a/lib/graal-sdk-21.1.0.jar b/lib/graal-sdk-21.1.0.jar deleted file mode 100644 index f90e5c0d2..000000000 Binary files a/lib/graal-sdk-21.1.0.jar and /dev/null differ diff --git a/lib/graal-sdk-22.3.1-javadoc.jar b/lib/graal-sdk-22.3.1-javadoc.jar new file mode 100644 index 000000000..f8710ef23 --- /dev/null +++ b/lib/graal-sdk-22.3.1-javadoc.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27b9dba14a8f1cf938a3aec75e22693e2f37f876dcf1713461259aaa0129fa0b +size 848222 diff --git a/lib/graal-sdk-22.3.1-sources.jar b/lib/graal-sdk-22.3.1-sources.jar new file mode 100644 index 000000000..6a2da5703 --- /dev/null +++ b/lib/graal-sdk-22.3.1-sources.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37769d0c1b5c66fb38009f6def8dc8255694228c4bb08b978d8eb06c5121cde0 +size 463530 diff --git a/lib/graal-sdk-22.3.1.jar b/lib/graal-sdk-22.3.1.jar new file mode 100644 index 000000000..761f44fcc --- /dev/null +++ b/lib/graal-sdk-22.3.1.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9a9b97279496346304565b501d3052503d9f17f384e466b2e67b30e548ebcedc +size 719371 diff --git a/lib/icu4j-68.2-javadoc.jar b/lib/icu4j-68.2-javadoc.jar deleted file mode 100644 index 51e45f3d3..000000000 Binary files a/lib/icu4j-68.2-javadoc.jar and /dev/null differ diff --git a/lib/icu4j-68.2-sources.jar b/lib/icu4j-68.2-sources.jar deleted file mode 100644 index ae61996aa..000000000 Binary files a/lib/icu4j-68.2-sources.jar and /dev/null differ diff --git a/lib/icu4j-68.2.jar b/lib/icu4j-68.2.jar deleted file mode 100644 index b0674fb1c..000000000 Binary files a/lib/icu4j-68.2.jar and /dev/null differ diff --git a/lib/icu4j-71.1-javadoc.jar b/lib/icu4j-71.1-javadoc.jar new file mode 100644 index 000000000..ae2c4d900 --- /dev/null +++ b/lib/icu4j-71.1-javadoc.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33f593aff558c180dffcfec93e069140fccf0b6ae4efe627c3d26f9061dc0ea6 +size 3237726 diff --git a/lib/icu4j-71.1-sources.jar b/lib/icu4j-71.1-sources.jar new file mode 100644 index 000000000..651142c09 --- /dev/null +++ b/lib/icu4j-71.1-sources.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db804ebf5b8cc1aed3e034bd714a68ca973d8ff3c9f3d1b23d67dc83fc596055 +size 2481722 diff --git a/lib/icu4j-71.1.jar b/lib/icu4j-71.1.jar new file mode 100644 index 000000000..08e9fd594 --- /dev/null +++ b/lib/icu4j-71.1.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91c4f8ebf0ceb489547098fe9d5c09a65eb419caea6ed714867f5280800bcf1a +size 13963762 diff --git a/lib/js-21.1.0-edit.jar b/lib/js-21.1.0-edit.jar deleted file mode 100644 index fc332a05c..000000000 Binary files a/lib/js-21.1.0-edit.jar and /dev/null differ diff --git a/lib/js-21.1.0-javadoc.jar b/lib/js-21.1.0-javadoc.jar deleted file mode 100644 index 209dae43e..000000000 Binary files a/lib/js-21.1.0-javadoc.jar and /dev/null differ diff --git a/lib/js-21.1.0-sources.jar b/lib/js-21.1.0-sources.jar deleted file mode 100644 index 27e81e1ca..000000000 Binary files a/lib/js-21.1.0-sources.jar and /dev/null differ diff --git a/lib/js-22.3.1-edit.jar b/lib/js-22.3.1-edit.jar new file mode 100644 index 000000000..67dc7f0cd --- /dev/null +++ b/lib/js-22.3.1-edit.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a095412814b38a3a061a0fdae1d36b7e9c9a41edf3b725a4ee9f7c88b8882e3e +size 9737791 diff --git a/lib/js-22.3.1-javadoc.jar b/lib/js-22.3.1-javadoc.jar new file mode 100644 index 000000000..e17585b3e --- /dev/null +++ b/lib/js-22.3.1-javadoc.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e81364dbaaa119aca034aa5907d079406b5a3ac05bfa802ce702e4a64d5d9713 +size 10103247 diff --git a/lib/js-22.3.1-sources.jar b/lib/js-22.3.1-sources.jar new file mode 100644 index 000000000..aadaae726 --- /dev/null +++ b/lib/js-22.3.1-sources.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:867f28c0d4061d06bdd4283c01cac7746c84fb9d145aec037ad3470808b1cbad +size 4138259 diff --git a/lib/js-scriptengine-21.1.0-javadoc.jar b/lib/js-scriptengine-21.1.0-javadoc.jar deleted file mode 100644 index c1c4a2470..000000000 Binary files a/lib/js-scriptengine-21.1.0-javadoc.jar and /dev/null differ diff --git a/lib/js-scriptengine-21.1.0-sources.jar b/lib/js-scriptengine-21.1.0-sources.jar deleted file mode 100644 index 179906ad7..000000000 Binary files a/lib/js-scriptengine-21.1.0-sources.jar and /dev/null differ diff --git a/lib/js-scriptengine-21.1.0.jar b/lib/js-scriptengine-21.1.0.jar deleted file mode 100644 index b03ca7a62..000000000 Binary files a/lib/js-scriptengine-21.1.0.jar and /dev/null differ diff --git a/lib/js-scriptengine-22.3.1-javadoc.jar b/lib/js-scriptengine-22.3.1-javadoc.jar new file mode 100644 index 000000000..01158222d --- /dev/null +++ b/lib/js-scriptengine-22.3.1-javadoc.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4493fa23daae0bc123231d53a09c830dd0e59d8dc01be76a6ef72efe5551f819 +size 29128 diff --git a/lib/js-scriptengine-22.3.1-sources.jar b/lib/js-scriptengine-22.3.1-sources.jar new file mode 100644 index 000000000..8684a3f87 --- /dev/null +++ b/lib/js-scriptengine-22.3.1-sources.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a8dda81ef526b3d6a56a9980c613925aa1e6dccb10fd87b7560dfd93ec873e1 +size 15613 diff --git a/lib/js-scriptengine-22.3.1.jar b/lib/js-scriptengine-22.3.1.jar new file mode 100644 index 000000000..c31d71c23 --- /dev/null +++ b/lib/js-scriptengine-22.3.1.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eef490b6f10aad56932c39df647f65b43bfee51845f1aff55963933a6f7c092c +size 73567 diff --git a/lib/regex-21.1.0-edit.jar b/lib/regex-21.1.0-edit.jar deleted file mode 100644 index f407e05d1..000000000 Binary files a/lib/regex-21.1.0-edit.jar and /dev/null differ diff --git a/lib/regex-21.1.0-javadoc.jar b/lib/regex-21.1.0-javadoc.jar deleted file mode 100644 index 8b8495d11..000000000 Binary files a/lib/regex-21.1.0-javadoc.jar and /dev/null differ diff --git a/lib/regex-21.1.0-sources.jar b/lib/regex-21.1.0-sources.jar deleted file mode 100644 index 77aeda5e0..000000000 Binary files a/lib/regex-21.1.0-sources.jar and /dev/null differ diff --git a/lib/regex-22.3.1-edit.jar b/lib/regex-22.3.1-edit.jar new file mode 100644 index 000000000..e42c40ad8 --- /dev/null +++ b/lib/regex-22.3.1-edit.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4df0b07e1e072d5c0f475941402250a5371ec55a38b2954d60ce7cc9ee59c6ee +size 1395516 diff --git a/lib/regex-22.3.1-javadoc.jar b/lib/regex-22.3.1-javadoc.jar new file mode 100644 index 000000000..8e7c4d660 --- /dev/null +++ b/lib/regex-22.3.1-javadoc.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbbcc22b2e54293c372f5a870fe3aa3ba75a53975e63d7890bfc8d690dab6d33 +size 1335232 diff --git a/lib/regex-22.3.1-sources.jar b/lib/regex-22.3.1-sources.jar new file mode 100644 index 000000000..8fb549492 --- /dev/null +++ b/lib/regex-22.3.1-sources.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23cb748ec6518b9118dc47f81f0eb2bf993c360aaecc859043580e911248d798 +size 887380 diff --git a/lib/truffle-api-21.1.0-javadoc.jar b/lib/truffle-api-21.1.0-javadoc.jar deleted file mode 100644 index 5a083501c..000000000 Binary files a/lib/truffle-api-21.1.0-javadoc.jar and /dev/null differ diff --git a/lib/truffle-api-21.1.0-sources.jar b/lib/truffle-api-21.1.0-sources.jar deleted file mode 100644 index 19ca21fcc..000000000 Binary files a/lib/truffle-api-21.1.0-sources.jar and /dev/null differ diff --git a/lib/truffle-api-21.1.0.jar b/lib/truffle-api-21.1.0.jar deleted file mode 100644 index 77ba08277..000000000 Binary files a/lib/truffle-api-21.1.0.jar and /dev/null differ diff --git a/lib/truffle-api-22.3.1-javadoc.jar b/lib/truffle-api-22.3.1-javadoc.jar new file mode 100644 index 000000000..c2cd06ea8 --- /dev/null +++ b/lib/truffle-api-22.3.1-javadoc.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdcb2560a19d64705e5d63bb35d2a60e9ea10e1abdfb93447fe8a7fca01c383b +size 1695495 diff --git a/lib/truffle-api-22.3.1-sources.jar b/lib/truffle-api-22.3.1-sources.jar new file mode 100644 index 000000000..8ea5fb9eb --- /dev/null +++ b/lib/truffle-api-22.3.1-sources.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f839d71ca860cb9c2f51f56d7278c499f51400e1156b74d167981ae631eb6963 +size 1932979 diff --git a/lib/truffle-api-22.3.1.jar b/lib/truffle-api-22.3.1.jar new file mode 100644 index 000000000..69c856ad2 --- /dev/null +++ b/lib/truffle-api-22.3.1.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91128a40337a026adf3dda6d8d3840a43649019ced886bc34a8bc53302a0b953 +size 15129658