diff --git a/build.gradle b/build.gradle index e9a6f415c..af3db2abb 100644 --- a/build.gradle +++ b/build.gradle @@ -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']) diff --git a/core/build.gradle b/core/build.gradle index 730ae4180..b6ce97175 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -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' diff --git a/core/libs/script-api-1.0.jar b/core/libs/script-api-1.0.jar new file mode 100644 index 000000000..61812eb91 Binary files /dev/null and b/core/libs/script-api-1.0.jar differ diff --git a/core/src/main/java/module-info.java b/core/src/main/java/module-info.java index a9742d64c..392d365f7 100644 --- a/core/src/main/java/module-info.java +++ b/core/src/main/java/module-info.java @@ -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;