From 933f2b6cf668dbbb705c29eeb6ba66263bd8b369 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Tue, 3 Sep 2019 17:48:13 -0700 Subject: [PATCH] Move identifier option to correct task (also set +x unix permission on gradlew) --- gradlew | 0 .../groovy/org/beryx/runtime/impl/JPackageImageTaskImpl.groovy | 1 - src/main/groovy/org/beryx/runtime/impl/JPackageTaskImpl.groovy | 1 + 3 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/groovy/org/beryx/runtime/impl/JPackageImageTaskImpl.groovy b/src/main/groovy/org/beryx/runtime/impl/JPackageImageTaskImpl.groovy index 7b9ca4ee..cb443d92 100644 --- 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 { '--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 index 5b0322d1..a998d475 100644 --- 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 { '--package-type', packageType, '--output', td.jpackageData.getInstallerOutputDir(), '--name', jpd.installerName, + '--identifier', jpd.identifier ?: jpd.mainClass, '--app-image', "$appImagePath", *jpd.installerOptions] }