diff --git a/src/rosjava_build_tools/gradle/Readme.md b/src/rosjava_build_tools/gradle/Readme.md index 61decdb579464cf7b9e9972864a15e9949ea99c7..4068f0ceab10aabf2d3d5e787adb590552a6fdc7 100644 --- a/src/rosjava_build_tools/gradle/Readme.md +++ b/src/rosjava_build_tools/gradle/Readme.md @@ -1,3 +1,3 @@ This is not installed, but it gets used to generate the gradle wrapper for a project. -It is currently the gradle wrapper supporting gradle 1.7. \ No newline at end of file +It is currently the gradle wrapper supporting gradle 1.9. \ No newline at end of file diff --git a/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar b/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar index b979729db0ad460288cfe16f07072da7b1305e93..667288ad6c2b3b87c990ece1267e56f0bcbf3622 100644 Binary files a/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar and b/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.properties b/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.properties index 51678041070c14df3b19d1739e6a7e48759212af..9858dc4bd37d96a6de12b30b218e5d53f1fd24c9 100644 --- a/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.properties +++ b/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Oct 18 13:01:06 CEST 2013 +#Thu Dec 26 09:16:38 KST 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip diff --git a/src/rosjava_build_tools/templates/android_package/build.gradle.in b/src/rosjava_build_tools/templates/android_package/build.gradle.in index 592b2218fb248e4acc00984af27d4a6951cd69cc..09cc556c18eac1a48c5976457779ab118ed8a819 100644 --- a/src/rosjava_build_tools/templates/android_package/build.gradle.in +++ b/src/rosjava_build_tools/templates/android_package/build.gradle.in @@ -15,7 +15,7 @@ */ task wrapper(type: Wrapper) { - gradleVersion = '1.8' + gradleVersion = '1.9' } buildscript { diff --git a/src/rosjava_build_tools/templates/rosjava_msg_project/build.gradle.in b/src/rosjava_build_tools/templates/rosjava_msg_project/build.gradle.in index d2efc9c870c6dbb92279b411b10a629c81b1911c..d13df141ba2b8d7caa56eebb703290db7b3b4bfb 100644 --- a/src/rosjava_build_tools/templates/rosjava_msg_project/build.gradle.in +++ b/src/rosjava_build_tools/templates/rosjava_msg_project/build.gradle.in @@ -15,8 +15,7 @@ */ try { - project.catkin.tree.pkgs['%(project_name)s'].generateUnofficialMessageArtifact(project) + project.catkin.tree.generateMessageArtifact(project, '%(project_name)s') } catch (NullPointerException e) { println("Couldn't find %(project_name)s on the ROS_PACKAGE_PATH") } - diff --git a/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in b/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in index 738e26f4794327e6510de30c67b56126c4eb27fc..090aace20d346f3aa07cf9b5d09a10f06b80b8e4 100644 --- a/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in +++ b/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in @@ -15,7 +15,7 @@ */ task wrapper(type: Wrapper) { - gradleVersion = '1.8' + gradleVersion = '1.9' } buildscript {