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

Also include service implementations in meta-inf

Browse Source
This commit is contained in:
SiboVG 2024-02-29 01:14:43 +01:00
parent 90c195b05f
commit b168f09906
6 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.gradle
View File

@ -83,7 +83,15 @@ jar {
attributes (
'Main-Class': 'info.openrocket.swing.startup.OpenRocket',
'Description': 'Model-rocketry aerodynamics and trajectory simulation software',
'SplashScreen-Image': 'pix/splashscreen.png'
'SplashScreen-Image': 'pix/splashscreen.png',
// Versioning
'Implementation-Version': props['build.version'],
// Vendor Details
'Implementation-Vendor': 'OpenRocket',
'Implementation-Vendor-Id': 'info.openrocket',
'Implementation-URL': 'https://openrocket.info/',
)
}
}

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

@ -98,13 +98,10 @@ open module info.openrocket.core {
exports info.openrocket.core.utils;
// Service providers
// Also edit core/src/main/resources/META-INF/services !! (until gradle-modules-plugin supports service
// copying, see https://github.com/java9-modularity/gradle-modules-plugin/issues/85)
provides info.openrocket.core.optimization.services.OptimizableParameterService with
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;
}

1
core/src/main/resources/META-INF/services/info.openrocket.core.optimization.services.OptimizableParameterService Normal file
View File

@ -0,0 +1 @@
info.openrocket.core.optimization.services.DefaultOptimizableParameterService

1
core/src/main/resources/META-INF/services/info.openrocket.core.optimization.services.SimulationModifierService Normal file
View File

@ -0,0 +1 @@
info.openrocket.core.optimization.services.DefaultSimulationModifierService

7
swing/src/main/java/module-info.java
View File

@ -30,6 +30,8 @@ open module info.openrocket.swing {
requires jakarta.inject;
// Service providers
// Also edit swing/src/main/resources/META-INF/services !! (until gradle-modules-plugin supports service
// copying, see https://github.com/java9-modularity/gradle-modules-plugin/issues/85)
provides info.openrocket.swing.gui.rocketfigure.RocketComponentShapeService with
info.openrocket.swing.gui.rocketfigure.BodyTubeShapes,
info.openrocket.swing.gui.rocketfigure.ComponentAssemblyShapes,
@ -48,9 +50,4 @@ open module info.openrocket.swing {
info.openrocket.swing.gui.rocketfigure.TransitionShapes,
info.openrocket.swing.gui.rocketfigure.TubeFinSetShapes,
info.openrocket.swing.gui.rocketfigure.TubeShapes;
/*opens info.openrocket.swing.startup.providers to com.google.guice;
opens info.openrocket.swing.startup to com.google.guice;
opens info.openrocket.swing.gui.util to com.google.guice;
opens info.openrocket.swing.gui.watcher to com.google.guice;*/
}

18
swing/src/main/resources/META-INF/services/info.openrocket.swing.gui.rocketfigure.RocketComponentShapeService Normal file
View File

@ -0,0 +1,18 @@
# Also edit module-info.java !
info.openrocket.swing.gui.rocketfigure.BodyTubeShapes
info.openrocket.swing.gui.rocketfigure.ComponentAssemblyShapes
info.openrocket.swing.gui.rocketfigure.FinSetShapes
info.openrocket.swing.gui.rocketfigure.LaunchLugShapes
info.openrocket.swing.gui.rocketfigure.MassComponentShapes
info.openrocket.swing.gui.rocketfigure.ParachuteShapes
info.openrocket.swing.gui.rocketfigure.ParallelStageShapes
info.openrocket.swing.gui.rocketfigure.PodSetShapes
info.openrocket.swing.gui.rocketfigure.RailButtonShapes
info.openrocket.swing.gui.rocketfigure.RingComponentShapes
info.openrocket.swing.gui.rocketfigure.RocketComponentShapes
info.openrocket.swing.gui.rocketfigure.ShockCordShapes
info.openrocket.swing.gui.rocketfigure.StreamerShapes
info.openrocket.swing.gui.rocketfigure.SymmetricComponentShapes
info.openrocket.swing.gui.rocketfigure.TransitionShapes
info.openrocket.swing.gui.rocketfigure.TubeFinSetShapes
info.openrocket.swing.gui.rocketfigure.TubeShapes