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

Juan Ignacio Ubeira · web-flow · commit dd14240d09e8 · 2018-04-25T17:59:01.000-03:00
Gradle upgrade: 3.5.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,7 @@ find_package(catkin REQUIRED
     tf2_msgs
 )
 
-catkin_rosjava_setup(publish installApp)
+catkin_rosjava_setup(publish installDist)
 
 # make sure messages get built first if genjava is enabled
 add_dependencies(gradle-${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@
  */
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '2.14.1'
+  gradleVersion = '3.5.1'
 }
 
 buildscript {
@@ -49,4 +49,4 @@ subprojects {
   }
 }
 
-defaultTasks 'publish', 'installApp'
+defaultTasks 'publish', 'installDist'
diff --git a/docs/build.gradle b/docs/build.gradle
@@ -37,8 +37,10 @@ task docs(type: Exec, dependsOn: [copySphinxConf, javadoc]) {
   commandLine 'make', 'html'
 }
 
-task clean << {
-  ant.delete dir: 'build'
-  ant.delete file: 'src/main/sphinx/conf.py'
+task clean {
+  doLast {
+    ant.delete dir: 'build'
+    ant.delete file: 'src/main/sphinx/conf.py'
+  }
 }
 
diff --git a/docs/src/main/sphinx/getting_started.rst b/docs/src/main/sphinx/getting_started.rst
@@ -154,7 +154,7 @@ processes:
 
   # source your devel/setup.bash
   roscd rosjava_core/rosjava_tutorial_pubsub
-  ../gradlew installApp
+  ../gradlew installDist
   roscore &
   ./build/install/rosjava_tutorial_pubsub/bin/rosjava_tutorial_pubsub org.ros.rosjava_tutorial_pubsub.Talker &
   ./build/install/rosjava_tutorial_pubsub/bin/rosjava_tutorial_pubsub org.ros.rosjava_tutorial_pubsub.Listener
@@ -235,7 +235,7 @@ Building and executing these nodes works in the same manner as described above:
 
   # source your devel/setup.bash
   roscd rosjava_core/rosjava_tutorial_pubsub
-  ../gradlew installApp
+  ../gradlew installDist
   roscore &
   ./build/install/rosjava_tutorial_services/bin/rosjava_tutorial_services org.ros.rosjava_tutorial_services.Server &
   ./build/install/rosjava_tutorial_services/bin/rosjava_tutorial_services org.ros.rosjava_tutorial_services.Client
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Feb 11 20:39:17 KST 2015
+#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
diff --git a/rosjava_tutorial_pubsub/build.gradle b/rosjava_tutorial_pubsub/build.gradle
@@ -22,5 +22,5 @@ dependencies {
   compile project(':rosjava')
 }
 
-defaultTasks 'publish', 'installApp'
+defaultTasks 'publish', 'installDist'
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ find_package(catkin REQUIRED`
`19`	`19`	`tf2_msgs`
`20`	`20`	`)`
`21`	`21`
`22`		`-catkin_rosjava_setup(publish installApp)`
	`22`	`+catkin_rosjava_setup(publish installDist)`
`23`	`23`
`24`	`24`	`# make sure messages get built first if genjava is enabled`
`25`	`25`	`add_dependencies(gradle-${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`task wrapper(type: Wrapper) {`
`18`		`- gradleVersion = '2.14.1'`
	`18`	`+ gradleVersion = '3.5.1'`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`buildscript {`
`@@ -49,4 +49,4 @@ subprojects {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`-defaultTasks 'publish', 'installApp'`
	`52`	`+defaultTasks 'publish', 'installDist'`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,10 @@ task docs(type: Exec, dependsOn: [copySphinxConf, javadoc]) {`
`37`	`37`	`commandLine 'make', 'html'`
`38`	`38`	`}`
`39`	`39`
`40`		`-task clean << {`
`41`		`- ant.delete dir: 'build'`
`42`		`- ant.delete file: 'src/main/sphinx/conf.py'`
	`40`	`+task clean {`
	`41`	`+ doLast {`
	`42`	`+ ant.delete dir: 'build'`
	`43`	`+ ant.delete file: 'src/main/sphinx/conf.py'`
	`44`	`+ }`
`43`	`45`	`}`
`44`	`46`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@ dependencies {`
`22`	`22`	`compile project(':rosjava')`
`23`	`23`	`}`
`24`	`24`
`25`		`-defaultTasks 'publish', 'installApp'`
	`25`	`+defaultTasks 'publish', 'installDist'`
`26`	`26`