Commits

shemnon committed 3ba7b63

allow setting the jfxrt jar in the configuration block, improve the error message.

  • Participants
  • Parent commits a92e6d3

Comments (0)

Files changed (1)

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

 
         configureConfigurations(project.configurations)
 
-        def jfxrtJarFile = project.files(findJFXJar())
+        def jfxrtJarFile = project.javafx.jfxrtJar ?: project.files(findJFXJar())
         project.javafx {
             jfxrtJar = jfxrtJarFile
-            antJavaFXJar = project.files(findAntJavaFXJar())
+            antJavaFXJar = antJavaFXJar ?: project.files(findAntJavaFXJar())
             appName = project.name //FIXME capatalize
             packaging = 'all'
             signingMode = 'release'
             }
         }
         if (!result?.file) {
-            println("""    Could not find $searchID, please set one of $places.keys""")
-            throw new GradleException("$searchID not found.\n ${log.join('\n')}");
+            throw new GradleException("Could not find $searchID, please set one of ${places.keySet()}");
         } else {
             project.logger.info("$searchID: ${result}")
             return result