Skip to content

Commit 28f0a7d

Browse files
authored
Merge pull request rosjava#4 from rosjava/kinetic
sync with rosjava/kinetic
2 parents d88d778 + 670f13f commit 28f0a7d

File tree

5 files changed

+9
-3
lines changed

5 files changed

+9
-3
lines changed

CHANGELOG.rst

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
Changelog for package genjava
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.3.4 (2019-01-23)
6+
------------------
7+
* Updating Gradle version to 4.10.2.
8+
* Minor fixes: cross compilation instruction, typos, dependency warnings.
9+
* Contributors: Arne, Daniel Ingram, Johannes Meyer, Juan Ignacio Ubeira, Julian Cerruti
10+
511
0.3.3 (2017-05-09)
612
------------------
713
* Updating message_generation dependency to kinetic range in template to generate messages properly.

package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package>
22
<name>genjava</name>
3-
<version>0.3.3</version>
3+
<version>0.3.4</version>
44
<description>
55
Java ROS message and service generators.
66
</description>

src/genjava/gradle/gradle.tar.gz

1.63 KB
Binary file not shown.

src/genjava/gradle_project.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ def create(msg_pkg_name, output_dir):
149149
os.makedirs(genjava_gradle_dir)
150150
msg_package_index = create_msg_package_index()
151151
if msg_pkg_name not in msg_package_index.keys():
152-
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)
152+
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)
153153

154154
msg_dependencies = create_dependency_string(msg_pkg_name, msg_package_index)
155155
print("msg_dependencies: %s" %msg_dependencies)

src/genjava/templates/genjava_project/build.gradle.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

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

2121
buildscript {

0 commit comments

Comments
 (0)