From 11f4f665935fa57054fae4cd7a686a72489014ab Mon Sep 17 00:00:00 2001
From: Juan Ignacio Ubeira <jubeira@ekumenlabs.com>
Date: Wed, 25 Apr 2018 17:57:09 -0300
Subject: [PATCH] Using 'doLast' instead of '<<' operator in templates.
---
.../templates/genjava_project/build.gradle.in | 44 ++++++++++---------
1 file changed, 24 insertions(+), 20 deletions(-)
diff --git a/src/genjava/templates/genjava_project/build.gradle.in b/src/genjava/templates/genjava_project/build.gradle.in
index df6a62a..f2da122 100644
--- a/src/genjava/templates/genjava_project/build.gradle.in
+++ b/src/genjava/templates/genjava_project/build.gradle.in
@@ -67,26 +67,28 @@ jar {
}
}
-task info << {
- println "\nProject Info"
- println "============\n"
- println "Name : ${rootProject}"
- println "Dir : ${projectDir}"
- println "Group : ${group}"
- println "Version : ${version}"
- println "Configurations: " + configurations
+task info {
+ doLast {
+ println "\nProject Info"
+ println "============\n"
+ println "Name : ${rootProject}"
+ println "Dir : ${projectDir}"
+ println "Group : ${group}"
+ println "Version : ${version}"
+ println "Configurations: " + configurations
- println "\nPackage Info"
- println "============\n"
- println "Name : %(project_name)s"
- println "Dir : %(pkg_directory)s"
+ println "\nPackage Info"
+ println "============\n"
+ println "Name : %(project_name)s"
+ println "Dir : %(pkg_directory)s"
- println "\nGenerate Info"
- println "============\n"
- println "Output Dir : ${generated_sources_directory}"
- println "Task Args : " + tasks["generateSources"].args
- tasks["generateSources"].outputs.getFiles().getAsFileTree().each {
- println "Files : ${it}"
+ println "\nGenerate Info"
+ println "============\n"
+ println "Output Dir : ${generated_sources_directory}"
+ println "Task Args : " + tasks["generateSources"].args
+ tasks["generateSources"].outputs.getFiles().getAsFileTree().each {
+ println "Files : ${it}"
+ }
}
}
@@ -98,8 +100,10 @@ task info << {
* Until we get this properly fixed (it fails in genjava), then we use the following bugfix to deal with the
* 'Could not copy MANIFEST.MF...' error that occurs when no sources are to be made for an artifact.
*/
-task bugfixtask << {
- mkdir sourceSets.main.output.classesDir
+task bugfixtask {
+ doLast {
+ mkdir sourceSets.main.output.classesDir
+ }
}
jar.dependsOn(bugfixtask)
--
GitLab