hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

THE JAVA SCRIPTING ERROR IS FINALLY GONE!!!

Browse Source
This commit is contained in:
SiboVG 2024-02-28 23:30:52 +01:00
parent 5e315c55da
commit 90c195b05f
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle
View File

@ -1,4 +1,5 @@
//// Top-level build file where you can add configuration options common to all sub-projects/modules.
import com.github.jengelman.gradle.plugins.shadow.transformers.ServiceFileTransformer
plugins {
id 'com.github.johnrengelman.shadow' version '7.1.2'
@ -45,6 +46,7 @@ subprojects {
modularity.patchModule("hamcrest", "hamcrest-2.2.jar")
modularity.patchModule("hamcrest.core", "hamcrest-core-2.2.jar")
modularity.patchModule("hamcrest.library", "hamcrest-library-2.2.jar")
modularity.patchModule("java.scripting", "script-api-1.0.jar")
}
test {
@ -80,6 +82,7 @@ jar {
manifest {
attributes (
'Main-Class': 'info.openrocket.swing.startup.OpenRocket',
'Description': 'Model-rocketry aerodynamics and trajectory simulation software',
'SplashScreen-Image': 'pix/splashscreen.png'
)
}
@ -92,7 +95,8 @@ dependencies {
shadowJar {
archiveBaseName.set('OpenRocket')
archiveClassifier.set(null)
archiveClassifier.set('')
archiveVersion.set(props['build.version'])
}
//shadowJar.dependsOn([':core:serializeEngines'])

1
core/build.gradle
View File

@ -48,6 +48,7 @@ dependencies {
implementation group: 'org.graalvm.js', name: 'js', version: '23.0.3'
implementation group: 'org.graalvm.truffle', name: 'truffle-api', version: '23.0.3'
implementation group: 'com.ibm.icu', name: 'icu4j', version: '71.1' // 72.1
implementation files('libs/script-api-1.0.jar')
//implementation group: 'com.sun.istack', name: 'istack-commons-tools', version: '4.1.1' // TODO: Should be gotten rid of?
//implementation group: 'com.sun.istack', name: 'istack-commons-runtime', version: '4.1.1' // TODO: Should be gotten rid of?
implementation group: 'io.github.classgraph', name: 'classgraph', version: '4.8.165'

BIN
core/libs/script-api-1.0.jar Normal file
View File

Binary file not shown.

2
core/src/main/java/module-info.java
View File

@ -102,6 +102,8 @@ open module info.openrocket.core {
info.openrocket.core.optimization.services.DefaultOptimizableParameterService;
provides info.openrocket.core.optimization.services.SimulationModifierService with
info.openrocket.core.optimization.services.DefaultSimulationModifierService;
/*provides javax.script.ScriptEngineFactory with
info.openrocket.core.scripting.GraalJSScriptEngineFactory;*/
//opens info.openrocket.core.formatting to com.google.guice;
//opens info.openrocket.core.startup to com.google.guice;