new message generation api and gradle 1.8->1.9 for templates.

stonier · stonier · commit 9b13a639190e · 2013-12-26T09:21:07.000+09:00
diff --git 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.
+It is currently the gradle wrapper supporting gradle 1.9.
diff --git a/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar b/src/rosjava_build_tools/gradle/gradle/wrapper/gradle-wrapper.jar
diff --git 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
@@ -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
@@ -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
@@ -15,7 +15,7 @@
  */
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.8'
+    gradleVersion = '1.9'
 }
 
 buildscript {

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`This is not installed, but it gets used to generate the gradle wrapper for a project.`
`2`	`2`
`3`		`-It is currently the gradle wrapper supporting gradle 1.7.`
	`3`	`+It is currently the gradle wrapper supporting gradle 1.9.`
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 = '1.8'`
	`18`	`+ gradleVersion = '1.9'`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`buildscript {`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`try {`
`18`		`- project.catkin.tree.pkgs['%(project_name)s'].generateUnofficialMessageArtifact(project)`
	`18`	`+ project.catkin.tree.generateMessageArtifact(project, '%(project_name)s')`
`19`	`19`	`} catch (NullPointerException e) {`
`20`	`20`	`println("Couldn't find %(project_name)s on the ROS_PACKAGE_PATH")`
`21`	`21`	`}`
`22`		`-`