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

Gradle upgrade: 3.5.1

parent 88616584
No related branches found
No related tags found
No related merge requests found
...@@ -19,7 +19,7 @@ find_package(catkin REQUIRED ...@@ -19,7 +19,7 @@ find_package(catkin REQUIRED
tf2_msgs tf2_msgs
) )
catkin_rosjava_setup(publish installApp) catkin_rosjava_setup(publish installDist)
# make sure messages get built first if genjava is enabled # make sure messages get built first if genjava is enabled
add_dependencies(gradle-${PROJECT_NAME} ${catkin_EXPORTED_TARGETS}) add_dependencies(gradle-${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
*/ */
task wrapper(type: Wrapper) { task wrapper(type: Wrapper) {
gradleVersion = '2.14.1' gradleVersion = '3.5.1'
} }
buildscript { buildscript {
...@@ -49,4 +49,4 @@ subprojects { ...@@ -49,4 +49,4 @@ subprojects {
} }
} }
defaultTasks 'publish', 'installApp' defaultTasks 'publish', 'installDist'
...@@ -154,7 +154,7 @@ processes: ...@@ -154,7 +154,7 @@ processes:
# source your devel/setup.bash # source your devel/setup.bash
roscd rosjava_core/rosjava_tutorial_pubsub roscd rosjava_core/rosjava_tutorial_pubsub
../gradlew installApp ../gradlew installDist
roscore & 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.Talker &
./build/install/rosjava_tutorial_pubsub/bin/rosjava_tutorial_pubsub org.ros.rosjava_tutorial_pubsub.Listener ./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: ...@@ -235,7 +235,7 @@ Building and executing these nodes works in the same manner as described above:
# source your devel/setup.bash # source your devel/setup.bash
roscd rosjava_core/rosjava_tutorial_pubsub roscd rosjava_core/rosjava_tutorial_pubsub
../gradlew installApp ../gradlew installDist
roscore & 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.Server &
./build/install/rosjava_tutorial_services/bin/rosjava_tutorial_services org.ros.rosjava_tutorial_services.Client ./build/install/rosjava_tutorial_services/bin/rosjava_tutorial_services org.ros.rosjava_tutorial_services.Client
......
No preview for this file type
#Wed Feb 11 20:39:17 KST 2015 #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
...@@ -22,5 +22,5 @@ dependencies { ...@@ -22,5 +22,5 @@ dependencies {
compile project(':rosjava') compile project(':rosjava')
} }
defaultTasks 'publish', 'installApp' defaultTasks 'publish', 'installDist'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment