From 5cb3acfe1378e737eecb417f4facc008c1d67d8f Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 7 Jun 2017 17:54:20 +0200
Subject: [PATCH] Ensure ant 'build' task is lead by 'init' task. Ensure ant
 'generate' task lead 'classes' task.

---
 build.gradle                                  | 23 ++++++++++++++-----
 .../jetbrains.mps.logic.reactor/build.gradle  |  1 +
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index e330fed1..d8e836ed 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,4 @@
-/*defaultTasks 'init'*/
-
-ant.importBuild('build.xml')
+defaultTasks 'init'
 
 allprojects {
     repositories {
@@ -18,8 +16,21 @@ task init(dependsOn: alldependencies) {
   }
 }
 
-task buildAll(dependsOn: ['init', 'clean', 'build']) {
-  doLast {
-    println 'Build finished.'
+ant.importBuild('build.xml')
+
+// ensure 'init' runs before 'fetchDependencies' task from ant build
+fetchDependencies {
+  dependsOn {
+    'init'
+  }
+}
+
+// ensure 'generate' runs before 'classes'
+classes {
+  dependsOn {
+    'generate'
+  }
+  mustRunAfter {
+    'generate'
   }
 }
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/build.gradle b/logic/solutions/jetbrains.mps.logic.reactor/build.gradle
index 91cec889..1a66b438 100644
--- a/logic/solutions/jetbrains.mps.logic.reactor/build.gradle
+++ b/logic/solutions/jetbrains.mps.logic.reactor/build.gradle
@@ -19,6 +19,7 @@ dependencies {
 }
 
 task downloadReactor {
+  ant.mkdir(dir: 'lib')
   ant.get(src: 'https://github.com/fisakov/conreactor/releases/download/v0.9-snapshot.1/conreactor-api-0.9.jar', dest: 'lib', usetimestamp: 'true', skipexisting: 'true')
   ant.get(src: 'https://github.com/fisakov/conreactor/releases/download/v0.9-snapshot.1/conreactor-core-0.9.jar', dest: 'lib',  usetimestamp: 'true', skipexisting: 'true')
 }