Fix incorrect jpackage/jpackageImage inputs/outputs (#237)

beryx · Sep 24, 2023 · 98a5ad1 · 98a5ad1
1 parent c93aa9b
commit 98a5ad1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/groovy/org/beryx/jlink/JPackageImageTask.groovy b/src/main/groovy/org/beryx/jlink/JPackageImageTask.groovy
@@ -55,7 +55,7 @@ class JPackageImageTask extends BaseTask {
         extension.imageName.get()
     }
 
-    @OutputDirectory
+    @InputDirectory
     Directory getImageDir() {
         extension.imageDir.get()
     }
@@ -65,6 +65,11 @@ class JPackageImageTask extends BaseTask {
         extension.jpackageData.get()
     }
 
+    @OutputDirectory
+    File getImageOutputDir() {
+        extension.jpackageData.get().imageOutputDir
+    }
+
     JPackageImageTask() {
         dependsOn(JlinkPlugin.TASK_NAME_JLINK)
         description = 'Creates an installable image using the jpackage tool'

diff --git a/src/main/groovy/org/beryx/jlink/JPackageTask.groovy b/src/main/groovy/org/beryx/jlink/JPackageTask.groovy
@@ -49,11 +49,16 @@ class JPackageTask extends BaseTask {
         extension.imageName
     }
 
-    @OutputDirectory
+    @Internal
     Directory getImageDir() {
         extension.imageDir.get()
     }
 
+    @InputDirectory
+    File getImageOutputDir() {
+        extension.jpackageData.get().imageOutputDir
+    }
+
     @Nested
     JPackageData getJpackageData() {
         extension.jpackageData.get()