From b505e0c72e43c65bcd4c4c3ce7f7b336da77b77a Mon Sep 17 00:00:00 2001 From: Gethin James Date: Sun, 15 Sep 2013 12:51:40 +0000 Subject: [PATCH] Make compile -> explodedDep depend on fetchWar - FetchWar will automatically download the dependencies with needed. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@55307 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- build.gradle | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index c50778d68a..82d533f186 100644 --- a/build.gradle +++ b/build.gradle @@ -178,9 +178,9 @@ subprojects { /** --- Compile tasks --- */ // make sure that the dependancies have been unpacked before compiling the Java - compileJava.doFirst { - explodeDeps.execute() - } +// compileJava.doFirst { +// explodeDeps.execute() +// } compileJava.options.encoding = 'UTF-8' compileTestJava.options.encoding = 'UTF-8' @@ -195,7 +195,7 @@ subprojects { rename { String filename -> warFile } } - task explodeDeps << { + task explodeDeps(dependsOn: fetchWarFile) << { explodedDir = file(explodedDepsDir) explodedLibDir = file(explodedLibsDir) @@ -250,7 +250,9 @@ subprojects { throw new TaskInstantiationException("Dependant WAR file ${warFile} can not be found. Please place it in ${warFileObj.getPath()} to continue.") } } - + + compileJava.dependsOn explodeDeps + task cleanDeps(dependsOn: clean) << { ant.delete(includeEmptyDirs: 'true', dir: explodedDepsDir) ant.delete(file: warFile)