Merge branch 'natsufumij-master'

beryx · Mar 3, 2022 · 9370e3c · 9370e3c
2 parents be15016 + 6e7cdc6
commit 9370e3c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/main/groovy/org/beryx/jlink/data/JPackageData.groovy b/src/main/groovy/org/beryx/jlink/data/JPackageData.groovy
@@ -65,6 +65,8 @@ class JPackageData {
     @Input @Optional
     String appVersion
 
+    String vendor
+
     @Input @Optional
     String icon
 
@@ -96,6 +98,11 @@ class JPackageData {
         launcherData.name
     }
 
+    @Input
+    String getVendor(){
+        this.@vendor ?: 'Unknown';
+    }
+
     @Input
     List<SecondaryLauncherData> getSecondaryLaunchers() {
         this.@secondaryLaunchers

diff --git a/src/main/groovy/org/beryx/jlink/impl/JPackageTaskImpl.groovy b/src/main/groovy/org/beryx/jlink/impl/JPackageTaskImpl.groovy
@@ -83,6 +83,9 @@ class JPackageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
                     throw new GradleException("The first character of the --app-version argument should be a digit.")
                 }
 
+                def vendor = jpd.getVendor()
+                def vendorOpts = ['--vendor',vendor]
+
                 final def resourceDir = jpd.resourceDir
                 final def resourceOpts = (resourceDir == null) ? [] : [ '--resource-dir', resourceDir ]
 
@@ -91,6 +94,7 @@ class JPackageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
                                '--dest', jpd.installerOutputDir,
                                '--name', jpd.installerName,
                                *versionOpts,
+                               *vendorOpts,
                                '--app-image', "$appImagePath",
                                *resourceOpts,
                                *jpd.installerOptions]