Skip to content
This repository has been archived by the owner on Jan 14, 2023. It is now read-only.

Kinetic updates #13

Merged
merged 3 commits into from
Dec 15, 2016
Merged

Kinetic updates #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6146470
Adds readme branch.
damonkohler Oct 21, 2013
83ed793
Version bump
Dec 15, 2016
cfa549f
Incorporate readme from readme branch
Dec 15, 2016
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
4 changes: 4 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

0.3.0 (2016-12-15)
------------------
* Updates for kinetic release.

0.2.1 (2015-02-25)
------------------
* gradle 1.8 -> 2.2.1
Expand Down
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ rosjava_extras
==============

Extra non-core rosjava libraries and applications.
=======

See [rosjava_core](https://github.com/rosjava/rosjava_core) readme.
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ task wrapper(type: Wrapper) {
}

buildscript {
apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/indigo/buildscript.gradle"
apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/kinetic/buildscript.gradle"
Copy link
Contributor

@stonier stonier Dec 16, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is probably something that could almost be made constant and ease the release process. Damon was looking into it at some point. However probably not high priority with this (last) release. Couldn't do immediately as it points to shifting changes in the rosjava bootstrap libraries.

@adamantivm could you:

  • Make an issue about this in rosjava bootstrap?
  • Check that the kinetic version of the buildscript points to the right rosjava bootstrap version as a dependency

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Issue created: rosjava/rosjava_bootstrap#54

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch about the dependency version: rosjava/rosjava_bootstrap#55

}

apply plugin: 'catkin'
Expand All @@ -39,7 +39,7 @@ subprojects {
*
* To modify, or add repos to the default external maven repositories list, pull request against this code:
*
* https://github.com/rosjava/rosjava_bootstrap/blob/indigo/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy#L31
* https://github.com/rosjava/rosjava_bootstrap/blob/kinetic/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosPlugin.groovy#L31
*/
apply plugin: "ros-java"
apply plugin: "osgi"
Expand Down
4 changes: 2 additions & 2 deletions hokuyo/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
*/

dependencies {
compile 'org.ros.rosjava_core:rosjava:[0.2,0.3)'
compile 'org.ros.rosjava_messages:sensor_msgs:[1.11,1.12)'
compile 'org.ros.rosjava_core:rosjava:[0.3,0.4)'
compile 'org.ros.rosjava_messages:sensor_msgs:[1.12,1.13)'
testCompile 'junit:junit:4.8.2'
}

2 changes: 1 addition & 1 deletion package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>rosjava_extras</name>
<version>0.2.1</version>
<version>0.3.0</version>
<description>
Extra packages for rosjava_core
</description>
Expand Down