From 7c79cb6c880324d840ec36cb9344bce7b5022f01 Mon Sep 17 00:00:00 2001
From: Daniel Stonier <d.stonier@gmail.com>
Date: Thu, 26 Jun 2014 10:55:27 +0900
Subject: [PATCH] groovy, gradle and dependency version updates.
---
.gitignore | 1 +
CHANGELOG.rst | 9 ++++--
CMakeLists.txt | 1 +
build.gradle | 30 +++++--------------
package.xml | 12 ++++----
rosjava/build.gradle | 10 +++----
rosjava_tutorial_right_hand_rule/build.gradle | 2 +-
settings.gradle | 19 ++++++++----
8 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/.gitignore b/.gitignore
index b260bbb6..8155b455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ build
.classpath
.project
.settings
+/bin
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f55b1fcc..c178dc9c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,9 @@
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Changelog for package rosjava_core
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+=========
+Changelog
+=========
+
+Forthcoming
+-----------
0.1.6 (2013-11-01)
------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97e33308..1871b231 100644
--- a/CMakeLists.txt
+++ b/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()
diff --git a/build.gradle b/build.gradle
index 27f85387..fa027491 100644
--- a/build.gradle
+++ b/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'
diff --git a/package.xml b/package.xml
index 7a59528b..d5008000 100644
--- a/package.xml
+++ b/package.xml
@@ -1,7 +1,7 @@
<?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>
diff --git a/rosjava/build.gradle b/rosjava/build.gradle
index e73f7cd1..b47eee56 100644
--- a/rosjava/build.gradle
+++ b/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'
diff --git a/rosjava_tutorial_right_hand_rule/build.gradle b/rosjava_tutorial_right_hand_rule/build.gradle
index 77191324..907db022 100644
--- a/rosjava_tutorial_right_hand_rule/build.gradle
+++ b/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)'
}
diff --git a/settings.gradle b/settings.gradle
index 9377ec99..b44bc547 100644
--- a/settings.gradle
+++ b/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
--
GitLab