Skip to content

Commit b706609

Browse files
committed
updated rosjava catkin_create process.
1 parent a30c643 commit b706609

File tree

4 files changed

+22
-25
lines changed

4 files changed

+22
-25
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
This is not installed, but it gets used to generate the gradle wrapper for a project.
22

3-
It is currently the gradle wrapper supporting gradle 1.9.
3+
It is currently the gradle wrapper supporting gradle 2.2.1
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Mar 19 17:27:39 KST 2014
1+
#Wed Feb 11 20:39:17 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-all.zip

src/rosjava_build_tools/templates/android_package/build.gradle.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

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

2121
buildscript {

src/rosjava_build_tools/templates/rosjava_package/build.gradle.in

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,11 @@
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

4025
apply plugin: 'catkin'
@@ -50,11 +35,23 @@ allprojects {
5035
}
5136

5237
subprojects {
38+
/*
39+
* The ros plugin configures a few things:
40+
*
41+
* - local deployment repository : where it dumps the jars and packaged artifacts)
42+
* - local maven repositories : where it finds your locally installed/built artifacts)
43+
* - external maven repositories : where it goes looking if it can't find dependencies locally
44+
*
45+
* To modify, or add repos to the default external maven repositories list, pull request against this code:
46+
*
47+
* https://github.com/rosjava/rosjava_bootstrap/blob/indigo/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy#L31
48+
*/
49+
apply plugin: "ros-java"
5350
/*
54-
See https://github.com/rosjava/rosjava_bootstrap (look for gradle_plugins)
55-
to see what is going on under the hood.
56-
*/
57-
apply plugin: 'ros-java'
51+
* Some IDE support if you use it.
52+
*/
53+
/* apply plugin: "eclipse" */
54+
/* apply plugin: "idea" */
5855
}
5956

6057
/*

0 commit comments

Comments
 (0)