Skip to content
This repository was archived by the owner on Aug 11, 2023. It is now read-only.

Gradle upgrade: 3.5.1 #265

Merged
merged 2 commits into from
Apr 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

buildscript {
Expand Down Expand Up @@ -49,4 +49,4 @@ subprojects {
}
}

defaultTasks 'publish', 'installApp'
defaultTasks 'publish', 'installDist'
8 changes: 5 additions & 3 deletions docs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

4 changes: 2 additions & 2 deletions docs/src/main/sphinx/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion rosjava_tutorial_pubsub/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ dependencies {
compile project(':rosjava')
}

defaultTasks 'publish', 'installApp'
defaultTasks 'publish', 'installDist'