Commits

shemnon committed 28a225b

tweak jfxrt discovery

Comments (0)

Files changed (1)

gradle-javafx-plugin/src/main/groovy/org/bitbucket/shemnon/javafxplugin/JavaFXPlugin.groovy

         def jfxrtHome = System.env['JFXRT_HOME']
         if (jfxrtHome) {
             try {
-                jfxrtJar = project.fileTree(dir: jfxrtHome, include: "**/jfxrt.jar").singleFile
+                jfxrtJar = project.fileTree(dir: jfxrtHome, include: ['jfxrt.jar', 'lib/jfxrt.jar', 'lib/ext/jfxrt/jar', 'jre/lib/jfxrt.jar', 'jre/lib/ext/jfxrt.jar']).singleFile
             } catch (IllegalStateException ignore) {
                 // no file or two files
             }
                 javaHome = System.properties['java.home']
             }
             try {
-                jfxrtJar = project.fileTree(dir: javaHome, include: "**/jfxrt.jar").singleFile
+                jfxrtJar = project.fileTree(dir: javaHome, include: ['lib/jfxrt.jar', 'lib/ext/jfxrt/jar', 'jre/lib/jfxrt.jar', 'jre/lib/ext/jfxrt.jar']).singleFile
             } catch (IllegalStateException ignore) {
                 // no file or two files
             }