Merge pull request #64 from jubeira/gradle-3-5-1

Gradle upgrade: 3.5.1

CMakeLists.txt

@@ -11,7 +11,7 @@ project(rosjava_bootstrap)
 
 find_package(catkin REQUIRED rosjava_build_tools)
 
-catkin_rosjava_setup(publish installApp)
+catkin_rosjava_setup(publish installDist)
 
 catkin_package()
 

build.gradle

@@ -63,4 +63,4 @@ subprojects {
   }
 }
 
-defaultTasks 'publish', 'installApp'
+defaultTasks 'publish', 'installDist'

gradle.gradle

 task wrapper(type: Wrapper) {
-    gradleVersion = '2.14.1'
+    gradleVersion = '3.5.1'
 }

gradle/wrapper/gradle-wrapper.properties

-#Tue Mar 11 23:34:43 MSK 2014
+#Fri Jan 26 13:47:21 ART 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip

gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy

@@ -56,15 +56,17 @@ class CatkinPlugin implements Plugin<Project> {
         if (packageXml != null) {
             project.catkin.pkg = new CatkinPackage(project, packageXml)
         }
+        project.catkin.tree.generate()
+
 	    setTasks()
     }
     def void setTasks() {
-        project.task('catkinPackageInfo') << {
+        project.task('catkinPackageInfo').doLast {
             println("CatkinPlugin is happy, you should be too.")
             println("Catkin Workspaces........." + project.catkin.workspaces)
             println("Catkin Packages")
-            project.catkin.packages.each { pkg ->
-                print pkg.value.toString()
+            project.catkin.tree.pkgs.each { pkg ->
+                println(pkg.value.toString())
             }
         }
     }