Merge pull request #91 from tobiasdiez/patch-1

Rename output to dest for jpackage task Remove identifier argument for jpackage task
beryx · Oct 2, 2019 · ba2cb46 · ba2cb46
2 parents a125c7d + 63f639b
commit ba2cb46
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/src/main/groovy/org/beryx/jlink/data/JPackageData.groovy b/src/main/groovy/org/beryx/jlink/data/JPackageData.groovy
@@ -60,9 +60,6 @@ class JPackageData {
 
     String installerName
 
-    @Input @Optional
-    String identifier
-
     @Input @Optional
     String appVersion
 

diff --git a/src/main/groovy/org/beryx/jlink/impl/JPackageImageTaskImpl.groovy b/src/main/groovy/org/beryx/jlink/impl/JPackageImageTaskImpl.groovy
@@ -83,7 +83,7 @@ class JPackageImageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
             final def resourceOpts = (resourceDir == null) ? [] : [ '--resource-dir', resourceDir ]
 
             commandLine = [jpackageExec,
-                           '--output', outputDir,
+                           '--dest', outputDir,
                            '--name', jpd.imageName,
                            '--module-path', td.jlinkJarsDir,
                            '--module', "$td.moduleName/$td.mainClass",

diff --git a/src/main/groovy/org/beryx/jlink/impl/JPackageTaskImpl.groovy b/src/main/groovy/org/beryx/jlink/impl/JPackageTaskImpl.groovy
@@ -80,9 +80,8 @@ class JPackageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
 
                 commandLine = [jpackageExec,
                                '--package-type', packageType,
-                               '--output', td.jpackageData.getInstallerOutputDir(),
+                               '--dest', td.jpackageData.getInstallerOutputDir(),
                                '--name', jpd.installerName,
-                               '--identifier', jpd.identifier ?: td.mainClass,
                                *versionOpts,
                                '--app-image', "$appImagePath",
                                *resourceOpts,