fix issue #95: Stackoverflow on Java 12 with Gradle 6.0 RC1

beryx · Oct 20, 2019 · b0df250 · b0df250
1 parent a9eb419
commit b0df250
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/src/main/groovy/org/beryx/jlink/JlinkTask.groovy b/src/main/groovy/org/beryx/jlink/JlinkTask.groovy
@@ -120,7 +120,7 @@ class JlinkTask extends BaseTask {
         taskImpl.execute()
     }
 
-    @OutputDirectory @PathSensitive(PathSensitivity.RELATIVE)
+    @OutputDirectory
     File getImageDirAsFile() {
         imageName ? imageDirFromName : imageDir.asFile
     }

diff --git a/src/main/groovy/org/beryx/jlink/data/JPackageData.groovy b/src/main/groovy/org/beryx/jlink/data/JPackageData.groovy
@@ -44,7 +44,7 @@ class JPackageData {
     @Input
     List<String> imageOptions = []
 
-    @Input @Optional
+    @InputDirectory @Optional
     File resourceDir
 
     @Input @Optional
@@ -84,19 +84,14 @@ class JPackageData {
         this.@installerName ?: launcherData.name ?: project.name
     }
 
-    @InputDirectory
-    File getResourceDir() {
-        this.@resourceDir
-    }
-
     @Input
     String getLauncherName() {
         launcherData.name
     }
 
     @Input
     List<SecondaryLauncherData> getSecondaryLaunchers() {
-        secondaryLaunchers
+        this.@secondaryLaunchers
     }
 
     void addSecondaryLauncher(SecondaryLauncherData launcher) {

diff --git a/src/main/groovy/org/beryx/jlink/data/JlinkPluginExtension.groovy b/src/main/groovy/org/beryx/jlink/data/JlinkPluginExtension.groovy
@@ -29,7 +29,6 @@ import org.gradle.api.provider.Provider
 import static org.beryx.jlink.util.Util.EXEC_EXTENSION
 
 @CompileStatic
-@ToString(includeNames = true)
 class JlinkPluginExtension {
     final Property<String> jlinkBasePath
     final Property<String> imageName