Merge pull request #279 from akhikhl/develop

#247: Could not find property 'main' on task ':run'.
akhikhl · Aug 5, 2016 · 8926363 · 8926363
2 parents 6646a6f + 1e76b52
commit 8926363
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/libs/gretty/src/main/groovy/org/akhikhl/gretty/GrettyPlugin.groovy b/libs/gretty/src/main/groovy/org/akhikhl/gretty/GrettyPlugin.groovy
@@ -351,8 +351,6 @@ class GrettyPlugin implements Plugin<Project> {
         debug = true
       }
 
-      project.tasks.debug.dependsOn 'appRunDebug'
-
       project.task('appStart', type: AppStartTask, group: 'gretty') {
         description = 'Starts web-app inplace (stopped by \'appStop\').'
         interactive = false
@@ -719,6 +717,18 @@ class GrettyPlugin implements Plugin<Project> {
         if(!integrationTestTaskAssigned)
           integrationTestTask null // default binding
       }
+
+      if(!project.tasks.findByName('run') && project.hasProperty('gretty_runTask') && Boolean.valueOf(project.gretty_runTask))
+        project.task('run', group: 'gretty') {
+          description = 'Starts web-app inplace, in interactive mode. Same as appRun task.'
+          dependsOn 'appRun'
+        }
+
+      if(!project.tasks.findByName('debug') && project.hasProperty('gretty_debugTask') && Boolean.valueOf(project.gretty_debugTask))
+        project.task('debug', group: 'gretty') {
+          description = 'Starts web-app inplace, in debug and interactive mode. Same as appRunDebug task.'
+          dependsOn 'appRunDebug'
+        }
     }
   }
 
@@ -777,17 +787,6 @@ class GrettyPlugin implements Plugin<Project> {
       tomcat8ServletApiVersion = Externalized.getString('tomcat8ServletApiVersion')
     }
 
-    if(!project.tasks.findByName('run') && project.tasks.findByName('appRun'))
-      project.task('run', group: 'gretty') {
-        description = 'Starts web-app inplace, in interactive mode. Same as appRun task.'
-        dependsOn 'appRun'
-      }
-
-    if(!project.tasks.findByName('debug'))
-      project.task('debug', group: 'gretty') {
-        description = 'Starts web-app inplace, in debug and interactive mode. Same as appRunDebug task.'
-      }
-
     addExtensions(project)
     addConfigurations(project)