Skip to content

Commit c1df903

Browse files
committed
Tweak relocation of GraalVM to fix incompatibilities
This fixes incompatibilities with Cobblemon and JsMacros. This also includes an update to Graal 25.0.1. Closes #34 Closes #53 Closes #39
1 parent 5de0672 commit c1df903

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

build.gradle

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@ jar {
188188
"Implementation-Title": "${project.name}",
189189
"Implementation-Version": "${project.mod_version}",
190190
"Implementation-Vendor" :"rubensworks",
191-
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
191+
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
192+
"Multi-Release": "true", // Required for shadowing GraalVM: https://www.graalvm.org/latest/reference-manual/embed-languages/#uber-jar-file-creation
192193
])
193194
}
194195
}
@@ -218,7 +219,8 @@ task deobfJar(type: Jar) {
218219
"Implementation-Title": "${project.name}",
219220
"Implementation-Version": "${project.mod_version}",
220221
"Implementation-Vendor" :"rubensworks",
221-
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
222+
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"),
223+
"Multi-Release": "true", // Required for shadowing GraalVM: https://www.graalvm.org/latest/reference-manual/embed-languages/#uber-jar-file-creation
222224
])
223225
}
224226
}
@@ -246,7 +248,16 @@ shadowJar {
246248
// relocate 'com.oracle', 'org.cyclops.integratedscripting.vendors.com.oracle'
247249
relocate 'com.oracle.js', 'org.cyclops.integratedscripting.vendors.com.oracle.js'
248250
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
251+
// relocate 'com.oracle.truffle', 'org.cyclops.integratedscripting.vendors.com.oracle.truffle'
252+
relocate 'com.oracle.truffle.api', 'org.cyclops.integratedscripting.vendors.com.oracle.truffle.api'
253+
relocate 'com.oracle.truffle.compiler', 'org.cyclops.integratedscripting.vendors.com.oracle.truffle.compiler'
254+
relocate 'com.oracle.truffle.host', 'org.cyclops.integratedscripting.vendors.com.oracle.truffle.host'
255+
relocate 'com.oracle.truffle.js', 'org.cyclops.integratedscripting.vendors.com.oracle.truffle.js'
256+
relocate 'com.oracle.truffle.object', 'org.cyclops.integratedscripting.vendors.com.oracle.truffle.object'
257+
// relocate 'com.oracle.truffle.polyglot', 'org.cyclops.integratedscripting.vendors.com.oracle.truffle.polyglot' // Relocation of src.com.oracle.truffle.polyglot.JDKSupport.java fails
258+
relocate 'com.oracle.truffle.regex', 'org.cyclops.integratedscripting.vendors.com.oracle.truffle.regex'
259+
relocate 'com.oracle.truffle.runtime', 'org.cyclops.integratedscripting.vendors.com.oracle.truffle.runtime'
260+
250261
finalizedBy 'reobfShadowJar'
251262
}
252263

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ integrateddynamics_version=1.20.1-1.21.3-723
66
release_type=release
77
fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
88

9-
graal_version=24.1.1
9+
graal_version=25.0.1
1010
commoncapabilities_version=1.20.1-2.9.0-98
1111

1212
# Workaround for Spotless bug

0 commit comments

Comments
 (0)