Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync with rosjava/kinetic #4

Merged
merged 7 commits into from
Nov 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Binary file modified src/genjava/gradle/gradle.tar.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion src/genjava/gradle_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/genjava/templates/genjava_project/build.gradle.in
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

task wrapper(type: Wrapper) {
gradleVersion = '3.5.1'
gradleVersion = '4.10.2'
}

buildscript {
Expand Down