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

Revert "Kinetic updates" #15

Merged
merged 1 commit into from
Dec 19, 2016
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: 0 additions & 6 deletions CHANGELOG.rst

This file was deleted.

1 change: 0 additions & 1 deletion README.md

This file was deleted.

6 changes: 3 additions & 3 deletions android_tutorial_hokuyo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*/

dependencies {
compile 'org.ros.android_core:android_10:[0.3,0.4)'
compile 'org.ros.android_core:android_acm_serial:[0.3,0.4)'
compile 'com.github.rosjava.rosjava_extras:hokuyo:[0.3,0.4)'
compile 'org.ros.android_core:android_10:[0.2,0.3)'
compile 'org.ros.android_core:android_acm_serial:[0.2,0.3)'
compile 'com.github.rosjava.rosjava_extras:hokuyo:[0.2,0.3)'
}

apply plugin: 'com.android.application'
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
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/android_core/raw/kinetic/buildscript.gradle"
apply from: "https://github.com/rosjava/android_core/raw/indigo/buildscript.gradle"
}

apply plugin: "catkin"
Expand Down
2 changes: 1 addition & 1 deletion gingerbread/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
*/

/*
/*
Gradle's maven plugin doesn't respect full artifact names yet, so
when another repo downloads this aar, it will have a conflict if the
basename is also gingerbread.aar. If this happens, switch the basename
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>android_extras</name>
<version>0.3.0</version>
<version>0.2.0</version>
<description>
Various additional and useful general packages, but not core.
</description>
Expand Down
6 changes: 3 additions & 3 deletions ros_master_browser/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*/

dependencies {
compile 'com.github.rosjava.zeroconf_jmdns_suite:jmdns:[0.3,0.4)'
compile 'org.ros.android_core:android_10:[0.3,0.4)'
compile 'com.github.rosjava.zeroconf_jmdns_suite:jmdns:[0.2,0.3)'
compile 'org.ros.android_core:android_10:[0.2,0.3)'
}

apply plugin: 'com.android.application'

android {
compileSdkVersion 10
}
Expand Down