Skip to content
Snippets Groups Projects
Commit c6deb912 authored by Holger Rapp's avatar Holger Rapp
Browse files

Merge pull request #18 from damonkohler/work

Switch to uploadArchives.
parents df559313 9b3fa798
No related branches found
No related tags found
No related merge requests found
...@@ -72,7 +72,7 @@ macro(catkin_rosjava_setup) ...@@ -72,7 +72,7 @@ macro(catkin_rosjava_setup)
find_gradle() find_gradle()
if( ${ARGC} EQUAL 0 ) if( ${ARGC} EQUAL 0 )
# Note : COMMAND is a list of variables (semi-colon separated) # 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() else()
set(gradle_tasks ${ARGV}) set(gradle_tasks ${ARGV})
endif() endif()
......
...@@ -11,7 +11,7 @@ project(%(repo_name)s) ...@@ -11,7 +11,7 @@ project(%(repo_name)s)
find_package(catkin REQUIRED rosjava_build_tools) find_package(catkin REQUIRED rosjava_build_tools)
# Set the gradle targets you want catkin's make to run by default # Set the gradle targets you want catkin's make to run by default
catkin_android_setup(publishMavenJavaPublicationToMavenRepository) catkin_android_setup(uploadArchives)
catkin_package() catkin_package()
############################################################################## ##############################################################################
......
...@@ -60,7 +60,7 @@ subprojects { ...@@ -60,7 +60,7 @@ subprojects {
/* /*
Some useful tasks: Some useful tasks:
install: deploys jar's to MavenLocal() (i.e. ~/.m2/repository) 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. installApp : assembles java apps in the _subproject_/build directories.
*/ */
defaultTasks 'install' defaultTasks 'install'
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment