issue #199: Version 2.24.2 fails with Unresolved reference: jvmArgs

Author: siordache

src/main/groovy/org/beryx/jlink/data/JPackageData.groovy

@@ -107,12 +107,12 @@ class JPackageData {
 
     @Input
     List<String> getJvmArgs() {
-        this.@jvmArgs ?: launcherData.getJvmArgs(project)
+        this.@jvmArgs ?: launcherData.getEffectiveJvmArgs(project)
     }
 
     @Input
     List<String> getArgs() {
-        this.@args ?: launcherData.getArgs(project)
+        this.@args ?: launcherData.getEffectiveArgs(project)
     }
 
     @OutputDirectory

src/main/groovy/org/beryx/jlink/data/LauncherData.groovy

@@ -25,8 +25,8 @@ import org.gradle.api.Project
 class LauncherData implements Serializable {
     private static final List<String> UNDEFINED_ARGS = ['<UNDEFINED>']
 
-    private List<String> configuredArgs = UNDEFINED_ARGS
-    private List<String> configuredJvmArgs = UNDEFINED_ARGS
+    List<String> args = UNDEFINED_ARGS
+    List<String> jvmArgs = UNDEFINED_ARGS
 
     String name
     File unixScriptTemplate
@@ -37,17 +37,11 @@ class LauncherData implements Serializable {
         this.name = name
     }
 
-    List<String> getArgs(Project project) {
-        (configuredArgs != UNDEFINED_ARGS) ? configuredArgs : Util.getDefaultArgs(project)
-    }
-    void setArgs(List<String> args) {
-        this.configuredArgs = args
+    List<String> getEffectiveArgs(Project project) {
+        (args != UNDEFINED_ARGS) ? args : Util.getDefaultArgs(project)
     }
 
-    List<String> getJvmArgs(Project project) {
-        (configuredJvmArgs != UNDEFINED_ARGS) ? configuredJvmArgs : Util.getDefaultJvmArgs(project)
-    }
-    void setJvmArgs(List<String> jvmArgs) {
-        this.configuredJvmArgs = jvmArgs
+    List<String> getEffectiveJvmArgs(Project project) {
+        (jvmArgs != UNDEFINED_ARGS) ? jvmArgs : Util.getDefaultJvmArgs(project)
     }
 }

src/main/groovy/org/beryx/jlink/impl/JPackageImageTaskImpl.groovy

@@ -17,7 +17,6 @@ package org.beryx.jlink.impl
 
 import groovy.transform.CompileDynamic
 import groovy.transform.CompileStatic
-import org.beryx.jlink.data.JPackageData
 import org.beryx.jlink.data.JPackageTaskData
 import org.beryx.jlink.util.Util
 import org.gradle.api.GradleException
@@ -75,12 +74,12 @@ class JPackageImageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
                     stream << "main-class=$launcher.mainClass\n"
                 }
 
-                def args = launcher.getArgs(project)
+                def args = launcher.getEffectiveArgs(project)
                 if(args) {
                     stream << "arguments=${args.collect{adjustArg(it)}.join('\\n')}\n"
                 }
 
-                def jvmArgs = launcher.getJvmArgs(project)
+                def jvmArgs = launcher.getEffectiveJvmArgs(project)
                 if(jvmArgs) {
                     stream << "java-options=${jvmArgs.collect{adjustArg(it)}.join('\\n')}\n"
                 }

src/main/groovy/org/beryx/jlink/util/LaunchScriptGenerator.groovy

@@ -25,7 +25,6 @@ import org.gradle.api.Project
 
 import java.util.function.Function
 import java.util.stream.Collectors
-import java.util.stream.Stream
 
 @CompileStatic
 @TupleConstructor
@@ -88,11 +87,11 @@ class LaunchScriptGenerator {
     String getScript(Type type) {
         def engine = new SimpleTemplateEngine()
 
-        def args = launcherData.getArgs(project).stream()
+        def args = launcherData.getEffectiveArgs(project).stream()
                 .map{adjustArg(it, type) as CharSequence}
                 .collect(Collectors.joining(' '))
 
-        def jvmArgs = launcherData.getJvmArgs(project).stream()
+        def jvmArgs = launcherData.getEffectiveJvmArgs(project).stream()
                 .map{adjustArg(it, type) as CharSequence}
                 .collect(Collectors.joining(' '))