shemnon avatar shemnon committed dd3e8b9

depend on the correct jar for jfxJar

Comments (0)

Files changed (1)

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

         def task = project.tasks.replace("jfxJar", JavaFXJarTask)
         task.description = "Adds JavaFX specific packaging to the jar."
         task.group = 'Build'
-        task.dependsOn = ['jar']
         
         project.afterEvaluate {
             project.configurations.archives.artifacts*.builtBy task
+            task.dependsOn = [sourceSet(project).jarTaskName]
         }
 
         [
         task.conventionMapping.mainClass = mainClassConvention
 
         task.conventionMapping.jarFile = {convention, aware ->
-            project.tasks.getByName("jar").archivePath
+            project.tasks.getByName(sourceSet(project).jarTaskName).archivePath
         }
         task.conventionMapping.classpath = {convention, aware ->
             FileCollection compileClasspath = sourceSet(project).compileClasspath;
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.