Merge pull request #228 from adamantivm/publish-target

adamantivm · web-flow · commit 30bfd614a698 · 2016-12-29T10:04:47.000-03:00
Update to Gradle publish target
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,7 @@ find_package(catkin REQUIRED
     tf2_msgs
 )
 
-catkin_rosjava_setup(publishMavenJavaPublicationToMavenRepository installApp)
+catkin_rosjava_setup(publish installApp)
 
 # 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
@@ -49,4 +49,4 @@ subprojects {
   }
 }
 
-defaultTasks 'publishMavenJavaPublicationToMavenRepository', 'installApp'
+defaultTasks 'publish', 'installApp'
diff --git a/rosjava_tutorial_pubsub/build.gradle b/rosjava_tutorial_pubsub/build.gradle
@@ -22,5 +22,5 @@ dependencies {
   compile project(':rosjava')
 }
 
-defaultTasks 'publishMavenJavaPublicationToMavenRepository', 'installApp'
+defaultTasks 'publish', 'installApp'
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ find_package(catkin REQUIRED`
`19`	`19`	`tf2_msgs`
`20`	`20`	`)`
`21`	`21`
`22`		`-catkin_rosjava_setup(publishMavenJavaPublicationToMavenRepository installApp)`
	`22`	`+catkin_rosjava_setup(publish installApp)`
`23`	`23`
`24`	`24`	`# make sure messages get built first if genjava is enabled`
`25`	`25`	`add_dependencies(gradle-${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})`
Original file line number	Diff line number	Diff line change
`@@ -49,4 +49,4 @@ subprojects {`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
`52`		`-defaultTasks 'publishMavenJavaPublicationToMavenRepository', 'installApp'`
	`52`	`+defaultTasks 'publish', 'installApp'`
Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,5 @@ dependencies {`
`22`	`22`	`compile project(':rosjava')`
`23`	`23`	`}`
`24`	`24`
`25`		`-defaultTasks 'publishMavenJavaPublicationToMavenRepository', 'installApp'`
	`25`	`+defaultTasks 'publish', 'installApp'`
`26`	`26`