diff --git a/CMakeLists.txt b/CMakeLists.txt index 490ffdff8232e4e6e158f9825424ec83fd628817..0be0c29135f856bbe9507367542d51d0363e3b56 100644 --- 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 index 721d0e8b81a047afbcd6527db8c1e342fd9122fe..ca137ba621c6aac642bd4faf4af04fb5681fc45f 100644 --- 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/src/main/sphinx/getting_started.rst b/docs/src/main/sphinx/getting_started.rst index e291265cb7fcc1d89a65774ea6601dc54a428cdb..24d866a08b248491dc2e74cc2c0ede59b6d38f36 100644 --- 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 index 3c7abdf12790879c06b07176de29647f77aa4129..72eace8d2cd26647484a02ff636d0291f22eee41 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eda4ff5d8441e838e88ecb44e9ab06c0ec3e69d0..7004efb677f15e4d7cfc17e6d186138df3f022a6 100644 --- 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 index 2cc3b63f5a029e08ddd517dcee3a825f58cf8886..11c866cf5a8ca19e90162d84054ab34ea51300d3 100644 --- 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'