diff --git a/build.gradle b/build.gradle index 1ac5399c1c1591079393c94ca73ad902f1448c3f..b5eb8068985bcfde5479ecab9e2ac31675df84be 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ */ task wrapper(type: Wrapper) { - gradleVersion = '1.7' + gradleVersion = '1.8' } project.ext { @@ -25,45 +25,45 @@ project.ext { } allprojects { - group='org.ros.rosjava_bootstrap' - version = '0.1.7' + group='org.ros.rosjava_bootstrap' + version = '0.1.7' } subprojects { - /* Have to manually do this below since our gradle plugin is our sub project */ - apply plugin: 'java' - apply plugin: 'maven' - apply plugin: 'maven-publish' + /* Have to manually do this below since our gradle plugin is our sub project */ + apply plugin: 'java' + apply plugin: 'maven' + apply plugin: 'maven-publish' - sourceCompatibility = 1.6 - targetCompatibility = 1.6 + sourceCompatibility = 1.6 + targetCompatibility = 1.6 - def repoURLs = project.rosMavenPath.collect { 'file://' + it } - repositories { - repoURLs.each { p -> - maven { - url p - } + def repoURLs = project.rosMavenPath.collect { 'file://' + it } + repositories { + repoURLs.each { p -> + maven { + url p + } + } + mavenLocal() + maven { + url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master' + } + } + if ( project.rosMavenDeploymentRepository != 'null' && project.rosMavenDeploymentRepository != '' ) { + publishing { + publications { + mavenJava(MavenPublication) { + from components.java } - mavenLocal() + } + repositories { maven { - url 'https://github.com/rosjava/rosjava_mvn_repo/raw/master' - } - } - if ( project.rosMavenDeploymentRepository != 'null' && project.rosMavenDeploymentRepository != '' ) { - publishing { - publications { - mavenJava(MavenPublication) { - from components.java - } - } - repositories { - maven { - url 'file://' + project.rosMavenDeploymentRepository - } - } + url 'file://' + project.rosMavenDeploymentRepository } + } } + } } defaultTasks 'install' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b979729db0ad460288cfe16f07072da7b1305e93..667288ad6c2b3b87c990ece1267e56f0bcbf3622 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 f645fc9e65e4fc3fd75b57b14898faf90929cce1..63b909dad703a64bb2415cc20474c2d753c96737 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 16 09:48:40 KST 2013 +#Fri Oct 18 14:47:55 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 diff --git a/gradle_plugins/build.gradle b/gradle_plugins/build.gradle index a58d6f22cdb0f869031621347e60beef679e37bd..f9ca5fa034beeb4d28930187c6f2cc06ded8a63a 100644 --- a/gradle_plugins/build.gradle +++ b/gradle_plugins/build.gradle @@ -18,5 +18,5 @@ apply plugin: 'groovy' dependencies { compile gradleApi() - groovy localGroovy() + compile localGroovy() }