Merge pull request #17 from damonkohler/work

Lots of bug fixes and clean ups.

Author: SirVer

.gitignore

@@ -4,3 +4,5 @@ bin
 .project
 .classpath
 .settings
+*.iml
+.idea

build.gradle

@@ -15,44 +15,55 @@
  */
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '1.8'
-}
-
-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"
+  gradleVersion = "1.9"
 }
 
 allprojects {
-  group='org.ros.rosjava_bootstrap'
-  version = '0.2.0'
+  group = "org.ros.rosjava_bootstrap"
+  version = "0.2.0"
 }
 
 subprojects {
-  /* Have to manually do this below since our gradle plugin is our sub project */
-  apply plugin: 'eclipse'
-  apply plugin: 'java'
-  apply plugin: 'maven'
-  apply plugin: 'maven-publish'
+  apply plugin: "eclipse"
+  apply plugin: "java"
+  apply plugin: "maven"
+  apply plugin: "maven-publish"
 
   sourceCompatibility = 1.6
   targetCompatibility = 1.6
 
-  def repoURLs = project.rosMavenPath.collect { 'file://' + it }
+  def rosMavenDeploymentRepository = System.getenv("ROS_MAVEN_DEPLOYMENT_REPOSITORY")
+  def rosMavenRepository = System.getenv("ROS_MAVEN_REPOSITORY")
+  def rosMavenPath = System.getenv("ROS_MAVEN_PATH")
+
   repositories {
-    repoURLs.each { p ->
-      maven {
-        url p
+    if (rosMavenPath != null) {
+      rosMavenPath.tokenize(":").each { path ->
+        maven {
+          url uri(path)
+        }
       }
     }
     mavenLocal()
     maven {
-      url project.rosMavenRepository
+      url "http://repository.springsource.com/maven/bundles/release"
+    }
+    maven {
+      url "http://repository.springsource.com/maven/bundles/external"
+    }
+    if (rosMavenRepository != null) {
+      maven {
+        url rosMavenRepository
+      }
+    } else {
+      maven {
+        url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
+      }
     }
+    mavenCentral()
   }
-  if ( project.rosMavenDeploymentRepository != 'null' && project.rosMavenDeploymentRepository != '' ) {
+  if (rosMavenDeploymentRepository != null &&
+      rosMavenDeploymentRepository != "") {
     publishing {
       publications {
         mavenJava(MavenPublication) {
@@ -61,11 +72,11 @@ subprojects {
       }
       repositories {
         maven {
-           url 'file://' + project.rosMavenDeploymentRepository
+           url uri(rosMavenDeploymentRepository)
         }
       }
     }
   }
 }
 
-defaultTasks 'install'
+defaultTasks "publishMavenJavaPublicationToMavenRepository"

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Fri Oct 18 14:47:55 CEST 2013
+#Wed Feb 12 13:19:19 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip

gradle/wrapper/gradle-wrapper.properties

@@ -14,9 +14,9 @@
  * the License.
  */
 
-apply plugin: 'groovy'
+apply plugin: "groovy"
 
 dependencies {
-    compile gradleApi()
-    compile localGroovy()
+  compile gradleApi()
+  compile "org.codehaus.groovy:groovy-all:2.2.0"
 }