Add configuration options for --add-modules and --verbose

Author: jjohannes

src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingExtension.java

@@ -73,8 +73,10 @@ abstract public class JavaModulePackagingExtension {
     abstract public Property<String> getVendor();
     abstract public Property<String> getCopyright();
     abstract public ListProperty<String> getJlinkOptions();
+    abstract public ListProperty<String> getAddModules();
     abstract public DirectoryProperty getJpackageResources();
     abstract public ConfigurableFileCollection getResources();
+    abstract public Property<Boolean> getVerbose();
 
     private final NamedDomainObjectContainer<Target> targets = getObjects().domainObjectContainer(Target.class);
 
@@ -240,9 +242,11 @@ private void registerTargetSpecificTasks(Target target, String applicationJarTas
             t.getCopyright().convention(getCopyright());
             t.getJavaOptions().convention(application.getApplicationDefaultJvmArgs());
             t.getJlinkOptions().convention(getJlinkOptions());
+            t.getAddModules().convention(getAddModules());
             t.getOptions().convention(target.getOptions());
             t.getPackageTypes().convention(target.getPackageTypes());
             t.getResources().from(getResources());
+            t.getVerbose().convention(getVerbose());
 
             t.getDestination().convention(getProject().getLayout().getBuildDirectory().dir("packages/" + target.getName()));
             t.getTempDirectory().convention(getProject().getLayout().getBuildDirectory().dir("tmp/jpackage/" + target.getName()));

src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingPlugin.java

@@ -49,5 +49,6 @@ public void apply(Project project) {
         javaModulePackaging.getApplicationVersion().convention(project.provider(() -> (String) project.getVersion()));
         javaModulePackaging.getJpackageResources().convention(project.provider(() ->
                 project.getLayout().getProjectDirectory().dir(mainResources.getSrcDirs().iterator().next().getParent() + "/resourcesPackage")));
+        javaModulePackaging.getVerbose().convention(false);
     }
 }

src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java

@@ -102,12 +102,18 @@ abstract public class Jpackage extends DefaultTask {
     @Input
     abstract public ListProperty<String> getJlinkOptions();
 
+    @Input
+    abstract public ListProperty<String> getAddModules();
+
     @Input
     abstract public ListProperty<String> getOptions();
 
     @Input
     abstract public ListProperty<String> getPackageTypes();
 
+    @Input
+    abstract public Property<Boolean> getVerbose();
+
     @OutputDirectory
     abstract public DirectoryProperty getDestination();
 
@@ -178,6 +184,12 @@ public void runJpackage() throws Exception {
             for (String javaOption : getJlinkOptions().get()) {
                 e.args("--jlink-options", javaOption);
             }
+            if (!getAddModules().get().isEmpty()) {
+                e.args("--add-modules", String.join(",", getAddModules().get()));
+            }
+            if (getVerbose().get()) {
+                e.args("--verbose");
+            }
         });
 
         File appImageFolder = requireNonNull(appImageParent.getAsFile().listFiles())[0];