Merge pull request #9 from rosjava/open_range

Maven style open ranges and version bump

Author: stonier

CHANGELOG.rst

@@ -2,6 +2,14 @@
 Changelog for package rosjava_bootstrap
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.2.0 (2013-10-25)
+------------------
+* official maven style open ranged dependencies
+* gradle 1.7-1.8
+* android build tools 17-18.1.1
+* message generation tests moved in
+* eclipse support
+
 0.1.7 (2013-09-23)
 ------------------
 * use maven-publish plugin for publishing rosjava packages.

build.gradle

@@ -22,11 +22,12 @@ project.ext {
   /* the ros plugin defines this, but since we're building the plugin... */
   rosMavenDeploymentRepository = "$System.env.ROS_MAVEN_DEPLOYMENT_REPOSITORY"
   rosMavenPath = "$System.env.ROS_MAVEN_PATH".split(':')
+  rosMavenRepository = "$System.env.ROS_MAVEN_REPOSITORY"
 }
 
 allprojects {
   group='org.ros.rosjava_bootstrap'
-  version = '0.1.7'
+  version = '0.2.0'
 }
 
 subprojects {
@@ -48,7 +49,7 @@ subprojects {
     }
     mavenLocal()
     maven {
-      url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master'
+      url project.rosMavenRepository
     }
   }
   if ( project.rosMavenDeploymentRepository != 'null' && project.rosMavenDeploymentRepository != '' ) {

gradle_plugins/src/main/groovy/org/ros/gradle_plugins/CatkinPlugin.groovy

@@ -86,12 +86,18 @@ class CatkinPackages {
 
     def generate() {
         if ( this.pkgs.size() == 0 ) {
-            println("Catkin plugin is generating the catkin package tree...")
             this.workspaces.each { workspace ->
                 def manifestTree = project.fileTree(dir: workspace, include: '**/package.xml')
                 manifestTree.each { file -> 
                     def pkg = new CatkinPackage(file)
-                    this.pkgs.put(pkg.name, pkg)
+                    if(this.pkgs.containsKey(pkg.name)) {
+                        if(this.pkgs[pkg.name].version < pkg.version) {
+                            println("Catkin generate tree: replacing older version of " + pkg.name + "[" + this.pkgs[pkg.name].version + "->" + pkg.version + "]") 
+                            this.pkgs[pkg.name] = pkg
+                        }
+                    } else {
+                        this.pkgs.put(pkg.name, pkg)
+                    }
                 }
             }
         }
@@ -140,7 +146,7 @@ class CatkinPackage {
 
     def void generateMessageArtifact(Project p) {
         p.version = version
-        p.dependencies.add("compile", 'org.ros.rosjava_bootstrap:message_generation:0.1.+')
+        p.dependencies.add("compile", 'org.ros.rosjava_bootstrap:message_generation:[0.2,0.3)')
         messageDependencies().each { d ->
             p.dependencies.add("compile", p.dependencies.project(path: ':' + d))
         }
@@ -160,7 +166,7 @@ class CatkinPackage {
      */
     def void generateMessageArtifactInSubFolder(Project p, String subfolderName, List<String> dependencies) {
         // p.version = version use the subfolder's project version
-        p.dependencies.add("compile", 'org.ros.rosjava_bootstrap:message_generation:0.1.+')
+        p.dependencies.add("compile", 'org.ros.rosjava_bootstrap:message_generation:[0.2,0.3)')
         dependencies.each { d ->
             p.dependencies.add("compile", p.dependencies.project(path: ':' + d))
         }

gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy

@@ -27,6 +27,7 @@ class RosPlugin implements Plugin<Project> {
         /* Create project.ros.* property extensions */
         project.extensions.create("ros", RosPluginExtension)
         project.ros.mavenPath = "$System.env.ROS_MAVEN_PATH".split(':')
+        project.ros.mavenRepository = "$System.env.ROS_MAVEN_REPOSITORY"
         project.ros.mavenDeploymentRepository = "$System.env.ROS_MAVEN_DEPLOYMENT_REPOSITORY"
         /* 
          * Could use some better handling for when this is not defined as it sets
@@ -41,7 +42,7 @@ class RosPlugin implements Plugin<Project> {
             }
             mavenLocal()
             maven {
-                url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master'
+                url project.ros.mavenRepository
             }
             mavenCentral()
         }

package.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>rosjava_bootstrap</name>
-  <version>0.1.7</version>
+  <version>0.2.0</version>
   <description>
     Bootstrap utilities for rosjava builds.
   </description>