diff --git a/build.gradle b/build.gradle index 8e861f3c81f6c4d9f702b789fba035976e042089..d1f152bad8ac388b732964a44b542d5000309cb3 100644 --- a/build.gradle +++ b/build.gradle @@ -15,39 +15,38 @@ */ task wrapper(type: Wrapper) { - gradleVersion = '1.7' + gradleVersion = '1.8' } 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' - } + def rosMavenPath = "$System.env.ROS_MAVEN_PATH".split(':').collect { 'file://' + it } + repositories { + rosMavenPath.each { p -> + maven { + url p + } } - dependencies { - classpath group: 'org.ros.rosjava_bootstrap', name: 'gradle_plugins', version: '0.1.+' + 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.+' + } } apply plugin: 'catkin' allprojects { - group 'org.ros.rosjava_core' - version = project.catkin.pkg.version + group 'org.ros.rosjava_core' + version = project.catkin.pkg.version } subprojects { - if (name != 'docs') { - apply plugin: 'ros-java' - } + if (name != 'docs') { + apply plugin: 'ros-java' + } } defaultTasks 'publishMavenJavaPublicationToMavenRepository' - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index faa569a9a0eedc9ff37450fed24a7efd77a86729..b979729db0ad460288cfe16f07072da7b1305e93 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4a11f780b4feac5c5e767423782a4d3a72274bf..51678041070c14df3b19d1739e6a7e48759212af 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 16 09:49:12 KST 2013 +#Fri Oct 18 13:01:06 CEST 2013 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.7-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip