Skip to content

Commit cb70184

Browse files
committed
Merge pull request #5 from damonkohler/master
Upgrades Gradle and Android build tools versions.
2 parents d780f65 + 908759d commit cb70184

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/rosjava_build_tools/create_android_project.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def parse_arguments():
3434
help='The name for the package')
3535
parser.add_argument('-s', '--sdk-version',
3636
action='store',
37-
default='17',
38-
help='Android sdk version [17]')
37+
default='18.1.1',
38+
help='Android sdk version [18.1.1]')
3939
parser.add_argument('-p', '--android-package-name',
4040
action='store',
4141
default='com.github.rosjava.android.pkg_name',

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.7'
18+
gradleVersion = '1.8'
1919
}
2020

2121
buildscript {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

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

2121
buildscript {
@@ -40,7 +40,7 @@ apply plugin: 'catkin'
4040

4141

4242
allprojects {
43-
/*
43+
/*
4444
A github url provides a good standard unique name for your project
4545
Example below, but you may wish to switch to your own unique url.
4646
*/
@@ -49,9 +49,9 @@ allprojects {
4949
}
5050

5151
subprojects {
52-
/*
52+
/*
5353
See https://github.com/rosjava/rosjava_bootstrap (look for gradle_plugins)
54-
to see what is going on under the hood.
54+
to see what is going on under the hood.
5555
*/
5656
apply plugin: 'ros-java'
5757
}

0 commit comments

Comments
 (0)