Skip to content

Commit d8d0cd3

Browse files
committed
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.
1 parent f03675a commit d8d0cd3

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,14 @@ shadowJar {
240240
configurations = [project.configurations.shadow]
241241
archiveClassifier.set(''); // Replace the default JAR
242242
// To avoid clashes with other mods
243-
// relocate 'org.graalvm', 'org.cyclops.integratedscripting.vendors.org.graalvm'
244-
// relocate 'com.oracle', 'org.cyclops.integratedscripting.vendors.com.oracle'
243+
relocate 'org.graalvm', 'org.cyclops.integratedscripting.vendors.org.graalvm'
245244
relocate 'com.ibm', 'org.cyclops.integratedscripting.vendors.com.ibm'
246-
finalizedBy 'reobfShadowJar'
245+
// Relocate everything from com.oracle, except for com.oracle.truffle, as this is defined in a native lib, which can not be relocated
246+
// relocate 'com.oracle', 'org.cyclops.integratedscripting.vendors.com.oracle'
247+
relocate 'com.oracle.js', 'org.cyclops.integratedscripting.vendors.com.oracle.js'
248+
relocate 'com.oracle.svm', 'org.cyclops.integratedscripting.vendors.com.oracle.svm'
249+
// relocate 'com.oracle.truffle', 'org.cyclops.integratedscripting.vendors.com.oracle.truffle' // Relocation of this fails for com.oracle.truffle.runtime.ModulesSupport at runtime
250+
finalizedBy 'reobfShadowJar'
247251
}
248252

249253
assemble.dependsOn shadowJar

0 commit comments

Comments
 (0)