Commits

shemnon  committed a5ab5fa

javafxMainClass becomes just mainClass in the javafx configuration. We presume the JavaFX loader with the packaging tools.

  • Participants
  • Parent commits 10d3630

Comments (0)

Files changed (6)

File plugin/src/main/groovy/com/bitbucket/shemnon/javafxplugin/JavaFXPlugin.groovy

         project.convention.plugins.javafx = new JavaFXPluginConvention(project, {
                 jfxrtJar = jfxrtJarFile
                 antJavaFXJar = project.files(findAntJavaFXJar())
-                javafxMainClass = "${project.group}${(project.group&&project.name)?'.':''}${project.name}${(project.group||project.name)?'.':''}Main"
+                mainClass = "${project.group}${(project.group&&project.name)?'.':''}${project.name}${(project.group||project.name)?'.':''}Main"
                 appName = project.name //FIXME capatalize
                 packaging = 'all'
                 debugKey {
 
         task.conventionMapping.appID = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).appID }
         task.conventionMapping.appName = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).appName }
-        task.conventionMapping.javafxMainClass = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).javafxMainClass }
+        task.conventionMapping.mainClass = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).mainClass }
 
         task.conventionMapping.inputFiles = {convention, aware -> convention.getPlugin(JavaPluginConvention).sourceSets.main.runtimeClasspath }
         task.conventionMapping.inputFiles = {convention, aware ->
 
         task.conventionMapping.antJavaFXJar = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).antJavaFXJar }
 
-        task.conventionMapping.javafxMainClass = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).javafxMainClass }
+        task.conventionMapping.mainClass = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).mainClass }
         task.conventionMapping.appName = {convention, aware -> convention.getPlugin(JavaFXPluginConvention).appName }
 
         task.conventionMapping.outputFile = {convention, aware ->

File plugin/src/main/groovy/com/bitbucket/shemnon/javafxplugin/JavaFXPluginConvention.groovy

     // app info
     String appID
     String appName
-    String javafxMainClass
+    String mainClass
 
     String packaging
 

File plugin/src/main/groovy/com/bitbucket/shemnon/javafxplugin/tasks/JavaFXDeployTask.groovy

             application(
                     id: getAppID(),
                     name: getAppName(),
-                    mainClass: getJavafxMainClass()
+                    mainClass: getMainClass()
                     //FIXME preloader
                     //FIXME fallback
             )
 
     String appID
     String appName
-    String javafxMainClass
+    String mainClass
 
 
     @InputFiles

File plugin/src/main/groovy/com/bitbucket/shemnon/javafxplugin/tasks/JavaFXJarTask.groovy

             }
             application(
                     name: getAppName(),
-                    mainClass: getJavafxMainClass()
+                    mainClass: getMainClass()
                     //FIXME preloader
                     //FIXME fallback
             )
     FileCollection antJavaFXJar
 
     String appName
-    String javafxMainClass
+    String mainClass
 
     @OutputFile
     File outputFile

File samples/ConferenceScheduleApp/build.gradle

 }
 
 javafx {
-    javafxMainClass = 'com.javafx.experiments.scheduleapp.ConferenceScheduleApp'
+    mainClass = 'com.javafx.experiments.scheduleapp.ConferenceScheduleApp'
 }

File samples/Ensemble2/build.gradle

 }
 
 javafx {
-    javafxMainClass = 'ensemble.Ensemble2'
+    mainClass = 'ensemble.Ensemble2'
 }