Do not require mainClass and moduleName to be set in secondaryLauncher (

#213)
beryx · Sep 24, 2023 · 58a2536 · 58a2536
1 parent 2c0289b
commit 58a2536
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/groovy/org/beryx/jlink/data/SecondaryLauncherData.groovy b/src/main/groovy/org/beryx/jlink/data/SecondaryLauncherData.groovy
@@ -35,8 +35,8 @@ class SecondaryLauncherData extends LauncherData {
 
     @CompileDynamic
     void check() {
-        ["name", "moduleName", "mainClass"].each {
-            if(!this."$it") throw new GradleException("Property '$it' not set in 'secondaryLauncher' block")
+        if (!this.name) {
+            throw new GradleException("Property 'name' not set in 'secondaryLauncher' block")
         }
     }
 }
diff --git a/src/main/groovy/org/beryx/jlink/impl/JlinkTaskImpl.groovy b/src/main/groovy/org/beryx/jlink/impl/JlinkTaskImpl.groovy
@@ -181,7 +181,9 @@ class JlinkTaskImpl extends BaseTaskImpl<JlinkTaskData> {
         def generator = new LaunchScriptGenerator(project, td.moduleName, td.mainClass, td.launcherData)
         generator.generate("$imageDir/bin")
         td.secondaryLaunchers.each { launcher ->
-            def secondaryGenerator = new LaunchScriptGenerator(project, launcher.moduleName, launcher.mainClass, launcher)
+            def moduleName = launcher.moduleName ? launcher.moduleName : td.moduleName
+            def mainClass = launcher.mainClass ? launcher.mainClass : td.mainClass
+            def secondaryGenerator = new LaunchScriptGenerator(project, moduleName, mainClass, launcher)
             secondaryGenerator.generate("$imageDir/bin")
         }
     }