Revert "Use jar-in-jar instead of shadowing, Closes #34"

This reverts commit c775246.

Closes #35

Author: rubensworks

build.gradle

@@ -3,6 +3,7 @@ plugins {
     id 'net.darkhax.curseforgegradle' version '1.0.8'
 	id 'com.github.kt3k.coveralls' version '2.12.0'
     id 'com.diffplug.spotless' version '6.25.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 	id 'com.modrinth.minotaur' version '2.+'
 }
 
@@ -142,27 +143,12 @@ dependencies {
 
     // https://mvnrepository.com/artifact/org.graalvm.sdk/graal-sdk
     modLib "org.graalvm.sdk:graal-sdk:${project.graal_version}"
+    shadow "org.graalvm.sdk:graal-sdk:${project.graal_version}"
     // https://mvnrepository.com/artifact/org.graalvm.js/js
     modLib ("org.graalvm.js:js:${project.graal_version}") {
         exclude group: 'com.ibm.icu', module: 'icu4j'
     }
-    // Every time the graal_version is changed, determine the list of deps to include in the jarJar by inspecting ./gradlew dependencies.
-    jarJar(group: 'org.graalvm.sdk', name: 'graal-sdk', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.sdk', name: 'collections', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.sdk', name: 'nativeimage', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.sdk', name: 'word', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.polyglot', name: 'polyglot', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.js', name: 'js', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.js', name: 'js-community', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.js', name: 'js-language', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.regex', name: 'regex', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.truffle', name: 'truffle-api', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.shadowed', name: 'icu4j', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.truffle', name: 'truffle-runtime', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.sdk', name: 'jniutils', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.truffle', name: 'truffle-compiler', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.truffle', name: 'truffle-enterprise', version: "[${project.graal_version}]")
-    jarJar(group: 'org.graalvm.sdk', name: 'nativebridge', version: "[${project.graal_version}]")
+    shadow "org.graalvm.js:js:${project.graal_version}"
 
 
     // Project lombok
@@ -271,15 +257,26 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
     from javadoc.destinationDir
 }
 
-jarJar.enable()
-tasks.jarJar.configure {
-    archiveClassifier.set('');
+shadowJar {
+    mergeServiceFiles() // To fix graal issue: https://github.com/oracle/graaljs/issues/125
+    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.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 {
+    shadowJar {}
 }
 
-
-
 artifacts {
-    archives tasks.jarJar
+    archives shadowJar
     archives deobfJar
     archives sourcesJar
     archives javadocJar
@@ -319,7 +316,7 @@ processResources {
 task publishCurseForge(type: TaskPublishCurseForge) {
     dependsOn(tasks.jar)
     apiToken = secrets.curseforgeKey;
-    def mainFile = upload(project.curseforge_project_id, tasks.jarJar)
+    def mainFile = upload(project.curseforge_project_id, shadowJar)
     mainFile.releaseType = secrets.build_number.equals("RELEASE") ? Constants.RELEASE_TYPE_RELEASE : Constants.RELEASE_TYPE_BETA
     mainFile.changelogType = "text"
     mainFile.changelog = secrets.changelog
@@ -337,7 +334,7 @@ modrinth {
     versionNumber = project.minecraft_version + '-' + project.version
     versionName = "${project.version} for NeoForge ${project.minecraft_version}"
     versionType = secrets.build_number.equals("RELEASE") ? "release" : "beta"
-    uploadFile = tasks.jarJar
+    uploadFile = shadowJar
     gameVersions = [ project.minecraft_version ]
     changelog = provider { secrets.changelog }
 
@@ -374,7 +371,7 @@ publishing {
 
     publications { PublicationContainer publicationContainer ->
         publicationContainer.register("maven", MavenPublication) { MavenPublication publication ->
-            publication.artifacts = [tasks.jarJar, javadocJar, deobfJar, sourcesJar]
+            publication.artifacts = [shadowJar, javadocJar, deobfJar, sourcesJar]
             publication.artifactId = project.archivesBaseName.toLowerCase() // GH can't handle uppercase...
         }
     }