groovy, gradle and dependency version updates.

.gitignore

@@ -5,3 +5,4 @@ build
 .classpath
 .project
 .settings
+/bin

CHANGELOG.rst

-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Changelog for package rosjava_core
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+=========
+Changelog
+=========
+
+Forthcoming
+-----------
 
 0.1.6 (2013-11-01)
 ------------------

CMakeLists.txt

@@ -11,6 +11,7 @@ project(rosjava_core)
 
 find_package(catkin REQUIRED rosjava_build_tools)
 
+#catkin_rosjava_setup(publishMavenJavaPublicationToMavenRepository installApp)
 catkin_rosjava_setup(publishMavenJavaPublicationToMavenRepository)
 
 catkin_package()

build.gradle

@@ -19,28 +19,10 @@ task wrapper(type: Wrapper) {
 }
 
 buildscript {
-  def rosMavenPath = "$System.env.ROS_MAVEN_PATH".split(':').collect { 'file://' + it }
-  def rosMavenRepository = "$System.env.ROS_MAVEN_REPOSITORY"
-  if ( rosMavenRepository == 'null' ) {
-    rosMavenRepository = "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
-  }
-  repositories {
-    rosMavenPath.each { p ->
-      maven {
-        url p
-      }
-    }
-    mavenLocal()
-    maven {
-      url rosMavenRepository
-    }
-  }
-  dependencies {
-    classpath group: 'org.ros.rosjava_bootstrap', name: 'gradle_plugins', version: '[0.1,0.2)'
-  }
+  apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/indigo/buildscript.gradle"
 }
 
-apply plugin: 'catkin'
+apply plugin: "catkin"
 
 allprojects {
   group 'org.ros.rosjava_core'
@@ -49,8 +31,12 @@ allprojects {
 
 subprojects {
   if (name != 'docs') {
-    apply plugin: 'ros-java'
+    apply plugin: "ros-java"
+    apply plugin: "osgi"
+    /*
+    apply plugin: "idea"
+    */
   }
 }
 
-defaultTasks 'publishMavenJavaPublicationToMavenRepository'
+defaultTasks 'publishMavenJavaPublicationToMavenRepository', 'installApp'

package.xml

 <?xml version="1.0"?>
 <package>
   <name>rosjava_core</name>
-  <version>0.1.6</version>
+  <version>0.2.0</version>
   <description>
     An implementation of ROS in pure-Java with Android support.
   </description>
@@ -12,9 +12,11 @@
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>rosjava_build_tools</build_depend>
   <build_depend>rosjava_bootstrap</build_depend>
-  <build_depend>rosjava_messages</build_depend>
-  <run_depend>rosjava_build_tools</run_depend>
-  <run_depend>rosjava_bootstrap</run_depend>
-  <run_depend>rosjava_messages</run_depend>
+  <build_depend>geometry_msgs</build_depend>
+  <build_depend>nav_msgs</build_depend>
+  <build_depend>rosjava_test_msgs</build_depend>
+  <build_depend>rosgraph_msgs</build_depend>
+  <build_depend>sensor_msgs</build_depend>
+  <build_depend>tf2_msgs</build_depend>
 </package>
 

rosjava/build.gradle

@@ -18,12 +18,12 @@ dependencies {
   compile project(':apache_xmlrpc_common')
   compile project(':apache_xmlrpc_server')
   compile project(':apache_xmlrpc_client')
-  compile 'org.ros.rosjava_bootstrap:message_generation:[0.1,0.2)'
-  compile 'org.ros.rosjava_messages:rosjava_test_msgs:[0.1,0.2)'
-  compile 'org.ros.rosjava_messages:rosgraph_msgs:[1.9,1.10)'
-  compile 'org.ros.rosjava_messages:geometry_msgs:[1.10,1.11)'
+  compile 'org.ros.rosjava_bootstrap:message_generation:[0.2,0.3)'
+  compile 'org.ros.rosjava_messages:rosjava_test_msgs:[0.2,0.3)'
+  compile 'org.ros.rosjava_messages:rosgraph_msgs:[1.10,1.11)'
+  compile 'org.ros.rosjava_messages:geometry_msgs:[1.11,1.12)'
   compile 'org.ros.rosjava_messages:nav_msgs:[1.10,1.11)'
-  compile 'org.ros.rosjava_messages:tf2_msgs:[0.4,0.5)'
+  compile 'org.ros.rosjava_messages:tf2_msgs:[0.5,0.6)'
   compile 'dnsjava:dnsjava:2.1.1'
   compile 'org.apache.commons:com.springsource.org.apache.commons.logging:1.1.1'
   compile 'org.apache.commons:com.springsource.org.apache.commons.net:2.0.0'

rosjava_tutorial_right_hand_rule/build.gradle

@@ -20,6 +20,6 @@ mainClassName = 'org.ros.RosRun'
 
 dependencies {
   compile project(':rosjava')
-  compile 'org.ros.rosjava_messages:sensor_msgs:[1.10,1.11)'
+  compile 'org.ros.rosjava_messages:sensor_msgs:[1.11,1.12)'
 }
 

settings.gradle

@@ -14,10 +14,19 @@
  * the License.
  */
 
-include 'apache_xmlrpc_common', 'apache_xmlrpc_client', 'apache_xmlrpc_server',
-        'rosjava', 'rosjava_geometry', 'rosjava_tutorial_pubsub',
-        'rosjava_tutorial_services', 'rosjava_tutorial_right_hand_rule',
-        'rosjava_benchmarks', 'rosjava_test', 'docs'
+include(
+    'apache_xmlrpc_client',
+    'apache_xmlrpc_common',
+    'apache_xmlrpc_server',
+    'rosjava',
+    'rosjava_geometry',
+    'rosjava_benchmarks',
+    'rosjava_test',
+    'rosjava_tutorial_pubsub',
+    'rosjava_tutorial_right_hand_rule',
+    'rosjava_tutorial_services',
+    'docs',
+    )
 
-include 'message_generation_tests'
+/* include 'message_generation_tests' */
         
\ No newline at end of file