Re-enable shadow renames, except for com.oracle.truffle, Closes #32

This makes this mod work correctle on all JVMs,
including GraalVM 21 and 23.

Author: rubensworks

build.gradle

@@ -148,7 +148,7 @@ dependencies {
     modLib ("org.graalvm.js:js:${project.graal_version}") {
         exclude group: 'com.ibm.icu', module: 'icu4j'
     }
-    shadow "org.graalvm.js:js:${project.graal_version}" // TODO: not working anymore after shadow... Don't rename during shadow?...
+    shadow "org.graalvm.js:js:${project.graal_version}"
 
 
     // Project lombok
@@ -262,9 +262,13 @@ shadowJar {
     configurations = [project.configurations.shadow]
     archiveClassifier.set(''); // Replace the default JAR
     // To avoid clashes with other mods
-//    relocate 'org.graalvm', 'org.cyclops.integratedscripting.vendors.org.graalvm'
-//    relocate 'com.oracle', 'org.cyclops.integratedscripting.vendors.com.oracle'
+    relocate 'org.graalvm', 'org.cyclops.integratedscripting.vendors.org.graalvm'
     relocate 'com.ibm', 'org.cyclops.integratedscripting.vendors.com.ibm'
+    // Relocate everything from com.oracle, except for com.oracle.truffle, as this is defined in a native lib, which can not be relocated
+//    relocate 'com.oracle', 'org.cyclops.integratedscripting.vendors.com.oracle'
+    relocate 'com.oracle.js', 'org.cyclops.integratedscripting.vendors.com.oracle.js'
+    relocate 'com.oracle.svm', 'org.cyclops.integratedscripting.vendors.com.oracle.svm'
+//    relocate 'com.oracle.truffle', 'org.cyclops.integratedscripting.vendors.com.oracle.truffle' // Relocation of this fails for com.oracle.truffle.runtime.ModulesSupport at runtime
 }
 assemble.dependsOn shadowJar
 jar {