Skip to content
Snippets Groups Projects
Commit 1d62652b authored by Juan Ignacio Ubeira's avatar Juan Ignacio Ubeira
Browse files

Gradle upgrade: 3.5.1

parent 304e5219
Branches
Tags
No related merge requests found
...@@ -11,7 +11,7 @@ project(rosjava_bootstrap) ...@@ -11,7 +11,7 @@ project(rosjava_bootstrap)
find_package(catkin REQUIRED rosjava_build_tools) find_package(catkin REQUIRED rosjava_build_tools)
catkin_rosjava_setup(publish installApp) catkin_rosjava_setup(publish installDist)
catkin_package() catkin_package()
......
...@@ -63,4 +63,4 @@ subprojects { ...@@ -63,4 +63,4 @@ subprojects {
} }
} }
defaultTasks 'publish', 'installApp' defaultTasks 'publish', 'installDist'
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '2.14.1' gradleVersion = '3.5.1'
} }
No preview for this file type
#Tue Mar 11 23:34:43 MSK 2014 #Fri Jan 26 13:47:21 ART 2018
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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
...@@ -56,15 +56,17 @@ class CatkinPlugin implements Plugin<Project> { ...@@ -56,15 +56,17 @@ class CatkinPlugin implements Plugin<Project> {
if (packageXml != null) { if (packageXml != null) {
project.catkin.pkg = new CatkinPackage(project, packageXml) project.catkin.pkg = new CatkinPackage(project, packageXml)
} }
project.catkin.tree.generate()
setTasks() setTasks()
} }
def void setTasks() { def void setTasks() {
project.task('catkinPackageInfo') << { project.task('catkinPackageInfo').doLast {
println("CatkinPlugin is happy, you should be too.") println("CatkinPlugin is happy, you should be too.")
println("Catkin Workspaces........." + project.catkin.workspaces) println("Catkin Workspaces........." + project.catkin.workspaces)
println("Catkin Packages") println("Catkin Packages")
project.catkin.packages.each { pkg -> project.catkin.tree.pkgs.each { pkg ->
print pkg.value.toString() println(pkg.value.toString())
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment