Merge pull request #15 from jubeira/gradle_3-5-1

Gradle update: 3.5.1
rosjava · Apr 25, 2018 · 6dfc703 · 6dfc703
2 parents bdb24da + 11f4f66
commit 6dfc703
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 21 deletions.
diff --git a/src/genjava/gradle/gradle.tar.gz b/src/genjava/gradle/gradle.tar.gz
diff --git a/src/genjava/templates/genjava_project/build.gradle.in b/src/genjava/templates/genjava_project/build.gradle.in
@@ -15,7 +15,7 @@
  */
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.14.1'
+    gradleVersion = '3.5.1'
 }
 
 buildscript {
@@ -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)