From b39149f9c2ae20c07628af34e8f2e882f910f775 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Wed, 7 Jun 2017 16:17:46 +0200
Subject: [PATCH] Import the generated build.xml into gradle build file.

---
 .gitignore                                             |  2 +-
 build.gradle                                           | 10 +++++++++-
 .../solutions/jetbrains.mps.logic.reactor/build.gradle |  4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index ea9aea8e..c418cec4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,8 +6,8 @@
 **/classes_jchr/*
 .mps/workspace.xml
 .idea/workspace.xml
+.gradle
 out
 build/*
 config/*
 system/*
-
diff --git a/build.gradle b/build.gradle
index 42e8d052..e330fed1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,6 @@
-defaultTasks 'init'
+/*defaultTasks 'init'*/
+
+ant.importBuild('build.xml')
 
 allprojects {
     repositories {
@@ -15,3 +17,9 @@ task init(dependsOn: alldependencies) {
     println 'Initialized all dependencies.'
   }
 }
+
+task buildAll(dependsOn: ['init', 'clean', 'build']) {
+  doLast {
+    println 'Build finished.'
+  }
+}
diff --git a/logic/solutions/jetbrains.mps.logic.reactor/build.gradle b/logic/solutions/jetbrains.mps.logic.reactor/build.gradle
index 74cc8cd2..91cec889 100644
--- a/logic/solutions/jetbrains.mps.logic.reactor/build.gradle
+++ b/logic/solutions/jetbrains.mps.logic.reactor/build.gradle
@@ -19,8 +19,8 @@ dependencies {
 }
 
 task downloadReactor {
-  ant.get(src: 'https://github.com/fisakov/conreactor/releases/download/v0.9-snapshot.1/conreactor-api-0.9.jar', dest: 'lib', skipexisting: 'true')
-  ant.get(src: 'https://github.com/fisakov/conreactor/releases/download/v0.9-snapshot.1/conreactor-core-0.9.jar', dest: 'lib', skipexisting: 'true')
+  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')
 }
 
 task copyDependencies (type: Copy, dependsOn: downloadReactor) {