From 206655a40857685bed11a8507826821f0bf5612c Mon Sep 17 00:00:00 2001 From: Daniel Stonier <d.stonier@gmail.com> Date: Thu, 12 Sep 2013 18:34:20 +0900 Subject: [PATCH] fixing plugin and rosjava dependencies. --- build.gradle | 18 ++++++++++++++++-- rosjava/build.gradle | 10 +++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 635d6f7c..42f7f9b0 100644 --- a/build.gradle +++ b/build.gradle @@ -14,8 +14,22 @@ * the License. */ -task wrapper(type: Wrapper) { - gradleVersion = '1.5' +buildscript { + def rosMavenPath = "$System.env.ROS_MAVEN_PATH".split(':').collect { 'file://' + it } + repositories { + rosMavenPath.each { p -> + maven { + url p + } + } + mavenLocal() + maven { + url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master' + } + } + dependencies { + classpath group: 'org.ros.rosjava_bootstrap', name: 'gradle_plugins', version: '0.1.0' + } } allprojects { diff --git a/rosjava/build.gradle b/rosjava/build.gradle index 5afcdbb5..ba87144c 100644 --- a/rosjava/build.gradle +++ b/rosjava/build.gradle @@ -15,21 +15,25 @@ */ dependencies { - compile project(':rosjava_bootstrap') - compile project(':rosjava_messages') compile project(':apache_xmlrpc_common') compile project(':apache_xmlrpc_server') compile project(':apache_xmlrpc_client') + compile 'org.ros.rosjava_bootstrap:message_generator:0.1.+' + compile 'org.ros.rosjava_messages:rosgraph_msgs:1.9.+' + compile 'org.ros.rosjava_messages:geometry_msgs:1.10.+' + compile 'org.ros.rosjava_messages:nav_msgs:1.10.+' + compile 'org.ros.rosjava_messages:tf2_msgs:0.4.+' 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' + compile 'com.google.guava:guava:12.0' testCompile 'junit:junit:4.8.2' testCompile 'org.mockito:mockito-all:1.8.5' } jar { manifest { - version = '0.0.0-SNAPSHOT' + version = project.version symbolicName = 'org.ros.rosjava' instruction 'Export-Package', '!org.ros.internal.*, org.ros.*' instruction 'Private-Package', 'org.ros.internal.*' -- GitLab