Merge pull request rosjava#4 from rosjava/kinetic

sync with rosjava/kinetic
fmessmer · Nov 22, 2020 · 28f0a7d · 28f0a7d
2 parents d88d778 + 670f13f
commit 28f0a7d
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog for package genjava
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.3.4 (2019-01-23)
+------------------
+* Updating Gradle version to 4.10.2.
+* Minor fixes: cross compilation instruction, typos, dependency warnings.
+* Contributors: Arne, Daniel Ingram, Johannes Meyer, Juan Ignacio Ubeira, Julian Cerruti
+
 0.3.3 (2017-05-09)
 ------------------
 * Updating message_generation dependency to kinetic range in template to generate messages properly.

diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>genjava</name>
-  <version>0.3.3</version>
+  <version>0.3.4</version>
   <description>
     Java ROS message and service generators.
   </description>

diff --git a/src/genjava/gradle/gradle.tar.gz b/src/genjava/gradle/gradle.tar.gz
diff --git a/src/genjava/gradle_project.py b/src/genjava/gradle_project.py
@@ -149,7 +149,7 @@ def create(msg_pkg_name, output_dir):
     os.makedirs(genjava_gradle_dir)
     msg_package_index = create_msg_package_index()
     if msg_pkg_name not in msg_package_index.keys():
-        raise IOError("could not find %s among message packages. Does the that package have a <build_depend> on message_generation in its package.xml?" % msg_pkg_name)
+        raise IOError("could not find %s among message packages. Does the package have a <build_depend> on message_generation in its package.xml?" % msg_pkg_name)
 
     msg_dependencies = create_dependency_string(msg_pkg_name, msg_package_index)
     print("msg_dependencies: %s" %msg_dependencies)

diff --git a/src/genjava/templates/genjava_project/build.gradle.in b/src/genjava/templates/genjava_project/build.gradle.in
@@ -15,7 +15,7 @@
  */
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '3.5.1'
+    gradleVersion = '4.10.2'
 }
 
 buildscript {