Merge pull request #11 from rosjava/open_range

Maven style open ranges and version bump.

CHANGELOG.rst

@@ -2,8 +2,14 @@
 Changelog
 ^^^^^^^^^
 
+0.2.0 [2013-10-25]
+==================
+* official maven style open range dependencies in templates
+* gradle 1.7->1.8
+* android build tools 18.1.1
+
 0.1.24 [2013-10-04]
-======================
+===================
 
 * bugfix for missing catkin_create_rosjava_xxx templates.
 

cmake/rosjava.cmake.em

@@ -45,11 +45,17 @@ endmacro()
 # override a user setting.
 macro(_rosjava_env)
     set(ROS_MAVEN_DEPLOYMENT_REPOSITORY $ENV{ROS_MAVEN_DEPLOYMENT_REPOSITORY})
+    set(ROS_MAVEN_REPOSITORY $ENV{ROS_MAVEN_REPOSITORY})
     if(NOT ROS_MAVEN_DEPLOYMENT_REPOSITORY)
         set(ROSJAVA_ENV "ROS_MAVEN_DEPLOYMENT_REPOSITORY=${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_MAVEN_DESTINATION}")
     else()
         set(ROSJAVA_ENV "ROS_MAVEN_DEPLOYMENT_REPOSITORY=${ROS_MAVEN_DEPLOYMENT_REPOSITORY}")
     endif()
+    if(NOT ROS_MAVEN_REPOSITORY)
+        list(APPEND ROSJAVA_ENV "ROS_MAVEN_REPOSITORY=https://github.com/rosjava/rosjava_mvn_repo/raw/master")
+    else()
+        set(ROSJAVA_ENV "ROS_MAVEN_REPOSITORY=${ROS_MAVEN_REPOSITORY}")
+    endif()
     # The build farm won't let you access /root/.gradle, so redirect it somewhere practical here.
     if(DEFINED CATKIN_BUILD_BINARY_PACKAGE)
       list(APPEND ROSJAVA_ENV "GRADLE_USER_HOME=${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_GRADLE_DESTINATION}")

env-hooks/15.rosjava.bash.em

@@ -8,3 +8,5 @@ SCRIPT=@(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_va
 
 export ROS_MAVEN_PATH=`python ${SCRIPT} --maven-path`
 export ROS_MAVEN_DEPLOYMENT_REPOSITORY=`python ${SCRIPT} --maven-deployment-repository`
+export ROS_MAVEN_REPOSITORY=`python ${SCRIPT} --maven-repository`
+

env-hooks/15.rosjava.sh.em

@@ -8,3 +8,4 @@ SCRIPT=@(CMAKE_INSTALL_PREFIX)/share/rosjava_build_tools/generate_environment_va
 
 export ROS_MAVEN_PATH=`python ${SCRIPT} --maven-path`
 export ROS_MAVEN_DEPLOYMENT_REPOSITORY=`python ${SCRIPT} --maven-deployment-repository`
+export ROS_MAVEN_REPOSITORY=`python ${SCRIPT} --maven-repository`

generate_environment_variables.py

@@ -9,6 +9,7 @@ def parse_arguments():
     parser = argparse.ArgumentParser(description='Generate environment variables for the rosjava maven environment.')
     cmd_group = parser.add_mutually_exclusive_group()
     cmd_group.add_argument('-d', '--maven-deployment-repository', action='store_true', help='Return the current devel workspace maven directory.')
+    cmd_group.add_argument('-r', '--maven-repository', action='store_true', help='The url to the external ros maven repository.')
     cmd_group.add_argument('-m', '--maven-path', action='store_true', help='Generate maven path across all chained workspcaes.')
     cmd_group.add_argument('-g', '--gradle-user-home', action='store_true', help='Generate the local gradle user home in the current devel workspace (share/gradle).')
     args = parser.parse_args()
@@ -48,6 +49,11 @@ if __name__ == '__main__':
             if repo in [os.path.join(w, 'share', 'maven') for w in workspaces]:
                 repo = os.path.join(workspaces[0], 'share', 'maven')
         print repo
+    elif args.maven_repository:
+        repo = get_environment_variable(environment_variables, 'ROS_MAVEN_REPOSITORY')
+        if repo is None:
+            repo = 'https://github.com/rosjava/rosjava_mvn_repo/raw/master'
+        print repo
     elif args.maven_path:
         new_maven_paths = [os.path.join(path, 'share', 'maven') for path in workspaces]
         maven_paths = get_environment_variable(environment_variables, 'ROS_MAVEN_PATH')

package.xml

 <package>
   <name>rosjava_build_tools</name>
-  <version>0.1.24</version>
+  <version>0.2.0</version>
   <description>
     Simple tools and catkin modules for rosjava development. 
   </description>

src/rosjava_build_tools/templates/android_package/build.gradle.in

@@ -20,6 +20,7 @@ task wrapper(type: Wrapper) {
 
 buildscript {
     def rosMavenPath = "$System.env.ROS_MAVEN_PATH".split(':').collect { 'file://' + it }
+    def rosMavenRepository = "$System.env.ROS_MAVEN_REPOSITORY"
     repositories {
         rosMavenPath.each { p ->
             maven {
@@ -28,11 +29,11 @@ buildscript {
         }
         mavenLocal()
         maven {
-            url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master'
+            url rosMavenRepository
         }
     }
     dependencies {
-        classpath group: 'org.ros.rosjava_bootstrap', name: 'gradle_plugins', version: '0.1.+'
+        classpath group: 'org.ros.rosjava_bootstrap', name: 'gradle_plugins', version: '[0.2,0.3)'
     }
 }
 

src/rosjava_build_tools/templates/android_project/build.gradle.in

@@ -17,17 +17,20 @@
 /* 
  Examples of 
    1) dependencies from another project in this gradle stack.
-   2,3) dependency from a maven repository.
+   2,3) open ranged dependencies from a maven repository.
    
-   It's a good idea to use + on the patch version dependency to
-   save continually updating these references, but avoid applying
-   the same principle to api breaking minor changes in the version.
+   It's a good idea to use open ranges on to
+   save continually updating these references, but it is recommended
+   to restrict this to the patch version number (e.g. [0.2,0.3) will
+   get the latest 0.2.x version) to avoid unknowingly
+   having api breaking changes usually associated with minor and major
+   version number changes.
 */
 /* 
 dependencies {
   compile project(':local_android_library_dependency')
-  compile 'org.ros.android_core:android_gingerbread_mr1:0.1.+'
-  compile 'com.github.ros_java.android_extras:gingerbread:0.1.+'
+  compile 'org.ros.android_core:android_10:[0.2,0.3)'
+  compile 'com.github.ros_java.android_extras:gingerbread:[0.2,0.3)'
 }
 */
 

src/rosjava_build_tools/templates/rosjava_package/build.gradle.in

@@ -20,6 +20,7 @@ task wrapper(type: Wrapper) {
 
 buildscript {
     def rosMavenPath = "$System.env.ROS_MAVEN_PATH".split(':').collect { 'file://' + it }
+    def rosMavenRepository = "$System.env.ROS_MAVEN_REPOSITORY"
     repositories {
         rosMavenPath.each { p ->
             maven {
@@ -28,11 +29,11 @@ buildscript {
         }
         mavenLocal()
         maven {
-            url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master'
+            url rosMavenRepository
         }
     }
     dependencies {
-        classpath group: 'org.ros.rosjava_bootstrap', name: 'gradle_plugins', version: '0.1.+'
+        classpath group: 'org.ros.rosjava_bootstrap', name: 'gradle_plugins', version: '[0.2,0.3)'
     }
 }
 

src/rosjava_build_tools/templates/rosjava_project/build.gradle.in

@@ -17,17 +17,20 @@
 /* 
  Examples of 
    1) dependencies from another project in this gradle stack.
-   2,3) dependency from a maven repository.
+   2,3) open ranged dependencies from a maven repository.
    
-   It's a good idea to use + on the patch version dependency to
-   save continually updating these references, but avoid applying
-   the same principle to api breaking minor changes in the version.
+   It's a good idea to use open ranges on to
+   save continually updating these references, but it is recommended
+   to restrict this to the patch version number (e.g. [0.2,0.3) will
+   get the latest 0.2.x version) to avoid unknowingly
+   having api breaking changes usually associated with minor and major
+   version number changes.
 */
 /* 
 dependencies {
   compile project(':local_android_library_dependency')
-  compile 'org.ros.android_core:android_gingerbread_mr1:0.1.+'
-  compile 'com.github.ros_java.android_extras:gingerbread:0.1.+'
+  compile 'org.ros.rosjava_core:rosjava:[0.2,0.3)'
+  compile 'com.github.rosjava.rosjava_extras:hokuyo:[0.2,0.3)'
 }
 */