Move identifier option to correct task

(also set +x unix permission on gradlew)
beryx · Sep 4, 2019 · 933f2b6 · 933f2b6
1 parent 1482a36
commit 933f2b6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 1 deletion.
diff --git a/gradlew b/gradlew
diff --git a/src/main/groovy/org/beryx/runtime/impl/JPackageImageTaskImpl.groovy b/src/main/groovy/org/beryx/runtime/impl/JPackageImageTaskImpl.groovy
@@ -56,7 +56,6 @@ class JPackageImageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
                            '--main-class', jpd.mainClass,
                            '--output', outputDir,
                            '--name', jpd.imageName,
-                           '--identifier', jpd.identifier ?: jpd.mainClass,
                            '--runtime-image', td.runtimeImageDir,
                            *(jpd.jvmArgs ? jpd.jvmArgs.collect{['--java-options', adjustArg(it)]}.flatten() : []),
                            *jpd.imageOptions]

diff --git a/src/main/groovy/org/beryx/runtime/impl/JPackageTaskImpl.groovy b/src/main/groovy/org/beryx/runtime/impl/JPackageTaskImpl.groovy
@@ -66,6 +66,7 @@ class JPackageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
                                '--package-type', packageType,
                                '--output', td.jpackageData.getInstallerOutputDir(),
                                '--name', jpd.installerName,
+                               '--identifier', jpd.identifier ?: jpd.mainClass,
                                '--app-image', "$appImagePath",
                                *jpd.installerOptions]
             }