From fcbdbe7e476737530c0aca468ea5300550a769b6 Mon Sep 17 00:00:00 2001 From: Fedor Isakov Date: Mon, 13 Apr 2020 17:12:44 +0200 Subject: [PATCH] Attempt to fix gradle task deps graph. --- build.gradle | 4 ++++ samples/fitch/build.gradle | 2 +- samples/lambdacalc/build.gradle | 4 ++-- samples/mpscore/build.gradle | 5 +++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index f721c182..08594083 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,10 @@ import groovy.xml.MarkupBuilder import java.util.regex.* +//plugins { +// id "com.dorongold.task-tree" version "1.5" +//} + defaultTasks 'assemble' allprojects { diff --git a/samples/fitch/build.gradle b/samples/fitch/build.gradle index c4c76363..f741cdd2 100644 --- a/samples/fitch/build.gradle +++ b/samples/fitch/build.gradle @@ -19,7 +19,7 @@ ant.importBuild('build.xml') {antTarget -> } // ensure 'generate' runs before 'classes' ('generate' is NOT optional) -'fitch-classes' { +'fitch-compileJava' { dependsOn { 'fitch-generate' } diff --git a/samples/lambdacalc/build.gradle b/samples/lambdacalc/build.gradle index bb1a52f2..5beeeaf9 100644 --- a/samples/lambdacalc/build.gradle +++ b/samples/lambdacalc/build.gradle @@ -19,10 +19,10 @@ ant.importBuild('build.xml') {antTarget -> } // ensure 'generate' runs before 'classes' ('generate' is NOT optional) -'lambdacalc-classes' { +'lambdacalc-compileJava' { dependsOn { 'lambdacalc-generate' - } + } mustRunAfter { 'lambdacalc-generate' } diff --git a/samples/mpscore/build.gradle b/samples/mpscore/build.gradle index 4ef32858..73350750 100644 --- a/samples/mpscore/build.gradle +++ b/samples/mpscore/build.gradle @@ -19,10 +19,10 @@ ant.importBuild('build.xml') {antTarget -> } // ensure 'generate' runs before 'classes' ('generate' is NOT optional) -'mpscore-classes' { +'mpscore-compileJava' { dependsOn { 'mpscore-generate' - } + } mustRunAfter { 'mpscore-generate' } @@ -51,3 +51,4 @@ check { 'mpscore-check' } } +