Merging master branch

CHANGELOG.rst

@@ -28,6 +28,12 @@ Changelog
 * minor bugfixes and improvements.
 * Contributors: Benjamin Chrétien, Daniel Stonier, Martin Pecka
 
+0.2.0 [2013-10-25]
+==================
+* official maven style open range dependencies in templates
+* gradle 1.7->1.8
+* android build tools 18.1.1
+
 0.1.34 (2014-06-12)
 ===================
 * assist rospack to speedup by ignoring the installed maven directories.

src/rosjava_build_tools/create_android_project.py

@@ -31,7 +31,7 @@ def parse_arguments():
     parser.add_argument('-t', '--target-version',
                         action='store',
                         default='15',
-                        help='Target android version [15]')
+                        help='Android sdk version [15]')
     parser.add_argument('-p', '--android-package-name',
                         action='store',
                         default='com.github.rosjava.android.pkg_name',

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

@@ -14,21 +14,24 @@
  * the License.
  */
 
-/* 
- Examples of 
+/*
+ Examples of
    1) dependencies from another project in this gradle stack.
    2,3) open ranged dependencies from a maven repository.
-
-   It's a good idea to restrict the open ranged dependency to
-   the patch version to avoid breakages due to api changes
-   which usually occur on minor and major version numbers.
+
+   It's a good idea to use open ranges on to
+   save continually updating these references, but it is recommended
+   to restrict this to the patch version number (e.g. [0.3,0.4) will
+   get the latest 0.3.x version) to avoid unknowingly
+   having api breaking changes usually associated with minor and major
+   version number changes.
 */
-/* 
+/*
 dependencies {
   compile project(':local_android_library_dependency')
-  compile 'org.ros.android_core:android_10:[0.2,0.3)'
-  compile 'org.ros.android_core:android_15:[0.2,0.3)'
-  compile 'com.github.rosjava.android_extras:gingerbread:[0.2,0.3)'
+  compile 'org.ros.android_core:android_10:[0.3,0.4)'
+  compile 'org.ros.android_core:android_15:[0.3,0.4)'
+  compile 'com.github.rosjava.android_extras:gingerbread:[0.3,0.4)'
   compile 'org.ros.rosjava_messages:tf2_msgs:[0.5,0.6)'
 }
 */
@@ -44,4 +47,4 @@ android {
     versionName "1.0"
   }
 }
- 
+

src/rosjava_build_tools/templates/rosjava_package/CMakeLists.txt.in

@@ -23,7 +23,7 @@ catkin_package()
 # Installation
 ##############################################################################
 
-# Change this to match the maven group name you have specified in the 
+# Change this to match the maven group name you have specified in the
 # allprojects closure the root build.gradle
-install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_MAVEN_DESTINATION}/com/github/rosjava/${PROJECT_NAME}/ 
+install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_GLOBAL_MAVEN_DESTINATION}/com/github/rosjava/${PROJECT_NAME}/
         DESTINATION ${CATKIN_GLOBAL_MAVEN_DESTINATION}/com/github/rosjava/${PROJECT_NAME})

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

@@ -36,10 +36,10 @@ allprojects {
 
 subprojects {
     /*
-     * The ros plugin configures a few things:
+     * The ros-java plugin configures a few things:
      *
      *  - local deployment repository : where it dumps the jars and packaged artifacts)
-     *  - local maven repositories    : where it finds your locally installed/built artifacts) 
+     *  - local maven repositories    : where it finds your locally installed/built artifacts)
      *  - external maven repositories : where it goes looking if it can't find dependencies locally
      *
      * To modify, or add repos to the default external maven repositories list, pull request against this code:

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

@@ -18,18 +18,25 @@
 apply plugin: 'application'
 mainClassName = 'org.ros.RosRun'
 
-/* 
- Dependencies can be on external maven artifacts (such as rosjava_core
- here) or on sibling subprojects. Fpr external maven artifact dependencies
- it's convenient to use an open ranged dependency, but restrict it to
- cover the patch version only to avoid breakages due to api changes
- which usually occur on minor and major version numbers.
+/*
+ Examples of
+   1) dependencies from another project in this gradle stack.
+   2,3) open ranged dependencies from a maven repository.
+
+   Dependencies can be on external maven artifacts (such as rosjava_core
+   here) or on sibling subprojects. For rosjava maven artifact dependencies
+   it is a good idea to use open ranges on to
+   save continually updating these references, but it is recommended
+   to restrict this to the patch version number (e.g. [0.3,0.4) will
+   get the latest 0.3.x version) to avoid unknowingly
+   having api breaking changes usually associated with minor and major
+   version number changes.
 */
 
 dependencies {
   /* An external maven artifact dependency */
-  compile 'org.ros.rosjava_core:rosjava:[0.2,0.3)'
-  /* Example of a local subproject dependency */ 
+  compile 'org.ros.rosjava_core:rosjava:[0.3,0.4)'
+  /* Example of a local subproject dependency */
   /* compile project(':sibling_gradle_project') */
 }