From 9b3fa798d9f0627ac9d7b90c34ecc58eb86311bd Mon Sep 17 00:00:00 2001
From: Damon Kohler <damonkohler@google.com>
Date: Wed, 19 Feb 2014 12:06:12 +0100
Subject: [PATCH] Switch to uploadArchives.
---
cmake/rosjava.cmake.em | 2 +-
.../templates/rosjava_package/CMakeLists.txt.in | 2 +-
.../templates/rosjava_package/build.gradle.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cmake/rosjava.cmake.em b/cmake/rosjava.cmake.em
index 3d0a155..b7a3c80 100644
--- a/cmake/rosjava.cmake.em
+++ b/cmake/rosjava.cmake.em
@@ -72,7 +72,7 @@ macro(catkin_rosjava_setup)
find_gradle()
if( ${ARGC} EQUAL 0 )
# Note : COMMAND is a list of variables (semi-colon separated)
- set(gradle_tasks "publishMavenJavaPublicationToMavenRepository") # old targets "install;installApp;uploadArchives"
+ set(gradle_tasks "uploadArchives") # old targets "install;installApp;uploadArchives"
else()
set(gradle_tasks ${ARGV})
endif()
diff --git a/src/rosjava_build_tools/templates/rosjava_package/CMakeLists.txt.in b/src/rosjava_build_tools/templates/rosjava_package/CMakeLists.txt.in
index ab5fa4b..651b6a0 100644
--- a/src/rosjava_build_tools/templates/rosjava_package/CMakeLists.txt.in
+++ b/src/rosjava_build_tools/templates/rosjava_package/CMakeLists.txt.in
@@ -11,7 +11,7 @@ project(%(repo_name)s)
find_package(catkin REQUIRED rosjava_build_tools)
# Set the gradle targets you want catkin's make to run by default
-catkin_android_setup(publishMavenJavaPublicationToMavenRepository)
+catkin_android_setup(uploadArchives)
catkin_package()
##############################################################################
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 e92c650..d123753 100644
--- a/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in
+++ b/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in
@@ -60,7 +60,7 @@ subprojects {
/*
Some useful tasks:
install: deploys jar's to MavenLocal() (i.e. ~/.m2/repository)
- publishMavenJavaPublicationToMavenRepository : deploys jar's to devel/share/maven
+ uploadArchives : deploys jar's to devel/share/maven
installApp : assembles java apps in the _subproject_/build directories.
*/
defaultTasks 'install'
--
GitLab