Skip to content

Commit 172407a

Browse files
committed
gradle 1.12 -> 2.2.1 and indigo buildscript.
1 parent 7bff90c commit 172407a

File tree

2 files changed

+7
-19
lines changed

2 files changed

+7
-19
lines changed

build.gradle

+5-17
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,14 @@
1515
*/
1616

1717
task wrapper(type: Wrapper) {
18-
gradleVersion = '1.11'
18+
gradleVersion = '2.2.1'
1919
}
2020

2121
buildscript {
22-
def rosMavenPath = "$System.env.ROS_MAVEN_PATH".split(':').collect { 'file://' + it }
23-
def rosMavenRepository = "$System.env.ROS_MAVEN_REPOSITORY"
24-
repositories {
25-
rosMavenPath.each { p ->
26-
maven {
27-
url p
28-
}
29-
}
30-
mavenLocal()
31-
maven {
32-
url rosMavenRepository
33-
}
34-
}
35-
dependencies {
36-
classpath group: 'org.ros.rosjava_bootstrap', name: 'gradle_plugins', version: '[0.1,0.2)'
37-
}
22+
apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/indigo/buildscript.gradle"
3823
}
3924

25+
4026
apply plugin: 'catkin'
4127

4228
allprojects {
@@ -55,6 +41,8 @@ subprojects {
5541
*/
5642
apply plugin: 'eclipse'
5743
apply plugin: 'ros-java'
44+
apply plugin: "idea"
45+
apply plugin: "osgi"
5846
}
5947

6048
/*
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 02 09:12:43 KST 2014
1+
#Thu Feb 12 11:19:54 KST 2015
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-bin.zip

0 commit comments

Comments
 (0)