Fix references and add SimpleSubscriberNode#5

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.

Sign up for GitHub

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

Open
MaxMorgenstern wants to merge 4 commits into
base:master
Choose a base branch
from
Open

Fix references and add SimpleSubscriberNode #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d69de4a
Update gradle
MaxMorgenstern Apr 8, 2017
34b533a
Add example subscriber node
MaxMorgenstern Apr 8, 2017
f811a1e
Bugfix in logging
MaxMorgenstern Apr 8, 2017
5da098b
Merge pull request #1 from MaxMorgenstern/2017-osx-fix
MaxMorgenstern Apr 8, 2017
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@
/.idea/workspace.xml
/build
.DS_Store

.idea
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,10 @@
buildscript {
repositories {
mavenCentral()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.android.tools.build:gradle:2.3.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All@@ -19,5 +20,6 @@ allprojects {
name "rosjava-github"
url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
}
jcenter()
}
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
#Fri Dec 05 12:41:53 CET 2014
#Sat Apr 08 11:19:15 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
25 changes: 25 additions & 0 deletions libraries/libraries.iml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":libraries" />
</configuration>
</facet>
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
7 changes: 2 additions & 5 deletions libraries/rosandroid-core/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 14
buildToolsVersion '25.0.0'
}

configurations {
all*.exclude group: 'org.ros.rosjava_bootstrap', module: 'gradle_plugins'
}

dependencies {

compile('org.ros.rosjava_core:rosjava:0.2.1') {
exclude group: 'xml-apis'
exclude group: 'junit'
}

compile 'org.ros.rosjava_messages:std_msgs:0.5.9'
compile 'org.ros.rosjava_messages:rosgraph_msgs:1.11.1'
compile 'org.ros.rosjava_messages:sensor_msgs:1.11.7'

}
124 changes: 124 additions & 0 deletions libraries/rosandroid-core/rosandroid-core.iml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries:rosandroid-core" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":libraries:rosandroid-core" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<afterSyncTasks>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
<option name="PROJECT_TYPE" value="1" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 14 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="apache_xmlrpc_common-0.2.1" level="project" />
<orderEntry type="library" exported="" name="tf2_msgs-0.5.13" level="project" />
<orderEntry type="library" exported="" name="dnsjava-2.1.1" level="project" />
<orderEntry type="library" exported="" name="rosgraph_msgs-1.11.2" level="project" />
<orderEntry type="library" exported="" name="rosjava_test_msgs-0.2.1" level="project" />
<orderEntry type="library" exported="" name="std_msgs-0.5.10" level="project" />
<orderEntry type="library" exported="" name="commons-pool-1.6" level="project" />
<orderEntry type="library" exported="" name="message_generation-0.2.1" level="project" />
<orderEntry type="library" exported="" name="geometry_msgs-1.11.9" level="project" />
<orderEntry type="library" exported="" name="com.springsource.org.apache.commons.net-2.0.0" level="project" />
<orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
<orderEntry type="library" exported="" name="rosjava-0.2.1" level="project" />
<orderEntry type="library" exported="" name="sensor_msgs-1.11.7" level="project" />
<orderEntry type="library" exported="" name="nav_msgs-1.11.9" level="project" />
<orderEntry type="library" exported="" name="com.springsource.org.apache.commons.codec-1.3.0" level="project" />
<orderEntry type="library" exported="" name="apache_xmlrpc_client-0.2.1" level="project" />
<orderEntry type="library" exported="" name="guava-12.0" level="project" />
<orderEntry type="library" exported="" name="com.springsource.org.apache.commons.logging-1.1.1" level="project" />
<orderEntry type="library" exported="" name="ws-commons-util-1.0.1" level="project" />
<orderEntry type="library" exported="" name="apache_xmlrpc_server-0.2.1" level="project" />
<orderEntry type="library" exported="" name="netty-3.5.2.Final" level="project" />
<orderEntry type="library" exported="" name="com.springsource.org.apache.commons.io-1.4.0" level="project" />
<orderEntry type="library" exported="" name="actionlib_msgs-1.11.9" level="project" />
<orderEntry type="library" exported="" name="com.springsource.org.apache.commons.lang-2.4.0" level="project" />
<orderEntry type="library" exported="" name="com.springsource.org.apache.commons.httpclient-3.1.0" level="project" />
</component>
</module>
17 changes: 8 additions & 9 deletions rosandroid-example-app/build.gradle
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"

compileSdkVersion 14
buildToolsVersion '25.0.0'
defaultConfig {
applicationId "org.ollide.rosandroid"
applicationId 'org.ollide.rosandroid'
// Android 4.0+ http://dannyroa.com/2013/10/17/why-its-time-to-support-only-android-4-0-and-above
minSdkVersion 14
targetSdkVersion 22
targetSdkVersion 14
versionCode 1
versionName "1.0"
versionName '0.1'
}
buildTypes {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

packagingOptions {
/* https://github.com/rosjava/android_core/issues/194 */
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
}
productFlavors {
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])

compile fileTree(include: ['*.jar'], dir: 'libs')
compile project(':libraries:rosandroid-core')
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix references and add SimpleSubscriberNode#5

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.

 Sign up for GitHub

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

 Open

MaxMorgenstern
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix references and add SimpleSubscriberNode
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d69de4a

Update gradle


MaxMorgenstern Apr 8, 2017
34b533a

Add example subscriber node


MaxMorgenstern Apr 8, 2017
f811a1e

Bugfix in logging


MaxMorgenstern Apr 8, 2017
5da098b

Merge pull request #1 from MaxMorgenstern/2017-osx-fix


MaxMorgenstern Apr 8, 2017

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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@
/.idea/workspace.xml
/build
.DS_Store

.idea

4 changes: 3 additions & 1 deletion
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,10 @@
buildscript {
 repositories {
 mavenCentral()
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:1.2.3'
 classpath 'com.android.tools.build:gradle:2.3.1'

 // NOTE: Do not place your application dependencies here; they belong
 // in the individual module build.gradle files
Expand All@@ -19,5 +20,6 @@ allprojects {
 name "rosjava-github"
 url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
 }
 jcenter()
 }
}

4 changes: 2 additions & 2 deletions
gradle/wrapper/gradle-wrapper.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
#Fri Dec 05 12:41:53 CET 2014
#Sat Apr 08 11:19:15 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

25 changes: 25 additions & 0 deletions
libraries/libraries.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries" />
 </configuration>
 </facet>
 <facet type="java-gradle" name="Java-Gradle">
 <configuration>
 <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
 <option name="BUILDABLE" value="false" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <excludeFolder url="file://$MODULE_DIR$/.gradle" />
 <excludeFolder url="file://$MODULE_DIR$/build" />
 </content>
 <orderEntry type="inheritedJdk" />
 <orderEntry type="sourceFolder" forTests="false" />
 </component>
</module>

7 changes: 2 additions & 5 deletions
libraries/rosandroid-core/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
apply plugin: 'com.android.library'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"
 compileSdkVersion 14
 buildToolsVersion '25.0.0'
}

configurations {
 all*.exclude group: 'org.ros.rosjava_bootstrap', module: 'gradle_plugins'
}

dependencies {

 compile('org.ros.rosjava_core:rosjava:0.2.1') {
 exclude group: 'xml-apis'
 exclude group: 'junit'
 }

 compile 'org.ros.rosjava_messages:std_msgs:0.5.9'
 compile 'org.ros.rosjava_messages:rosgraph_msgs:1.11.1'
 compile 'org.ros.rosjava_messages:sensor_msgs:1.11.7'

}

124 changes: 124 additions & 0 deletions
libraries/rosandroid-core/rosandroid-core.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries:rosandroid-core" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries:rosandroid-core" />
 </configuration>
 </facet>
 <facet type="android" name="Android">
 <configuration>
 <option name="SELECTED_BUILD_VARIANT" value="debug" />
 <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
 <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
 <afterSyncTasks>
 <task>generateDebugSources</task>
 </afterSyncTasks>
 <option name="ALLOW_USER_CONFIGURATION" value="false" />
 <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
 <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
 <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
 <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
 <option name="PROJECT_TYPE" value="1" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
 <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
 <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
 <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
 <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
 </content>
 <orderEntry type="jdk" jdkName="Android API 14 Platform" jdkType="Android SDK" />
 <orderEntry type="sourceFolder" forTests="false" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_common-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="tf2_msgs-0.5.13" level="project" />
 <orderEntry type="library" exported="" name="dnsjava-2.1.1" level="project" />
 <orderEntry type="library" exported="" name="rosgraph_msgs-1.11.2" level="project" />
 <orderEntry type="library" exported="" name="rosjava_test_msgs-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="std_msgs-0.5.10" level="project" />
 <orderEntry type="library" exported="" name="commons-pool-1.6" level="project" />
 <orderEntry type="library" exported="" name="message_generation-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="geometry_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.net-2.0.0" level="project" />
 <orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
 <orderEntry type="library" exported="" name="rosjava-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="sensor_msgs-1.11.7" level="project" />
 <orderEntry type="library" exported="" name="nav_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.codec-1.3.0" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_client-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="guava-12.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.logging-1.1.1" level="project" />
 <orderEntry type="library" exported="" name="ws-commons-util-1.0.1" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_server-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="netty-3.5.2.Final" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.io-1.4.0" level="project" />
 <orderEntry type="library" exported="" name="actionlib_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.lang-2.4.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.httpclient-3.1.0" level="project" />
 </component>
</module>

17 changes: 8 additions & 9 deletions
rosandroid-example-app/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
apply plugin: 'com.android.application'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"

 compileSdkVersion 14
 buildToolsVersion '25.0.0'
 defaultConfig {
 applicationId "org.ollide.rosandroid"
 applicationId 'org.ollide.rosandroid'
 // Android 4.0+ http://dannyroa.com/2013/10/17/why-its-time-to-support-only-android-4-0-and-above
 minSdkVersion 14
 targetSdkVersion 22
 targetSdkVersion 14
 versionCode 1
 versionName "1.0"
 versionName '0.1'
 }
 buildTypes {
 release {
 minifyEnabled true
 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 }
 }

 packagingOptions {
 /* https://github.com/rosjava/android_core/issues/194 */
 exclude 'META-INF/LICENSE.txt'
 exclude 'META-INF/NOTICE.txt'
 }
 productFlavors {
 }
}

dependencies {
 compile fileTree(dir: 'libs', include: ['*.jar'])

 compile fileTree(include: ['*.jar'], dir: 'libs')
 compile project(':libraries:rosandroid-core')
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix references and add SimpleSubscriberNode#5

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.

 Sign up for GitHub

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

 Open

MaxMorgenstern
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix references and add SimpleSubscriberNode
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d69de4a

Update gradle


MaxMorgenstern Apr 8, 2017
34b533a

Add example subscriber node


MaxMorgenstern Apr 8, 2017
f811a1e

Bugfix in logging


MaxMorgenstern Apr 8, 2017
5da098b

Merge pull request #1 from MaxMorgenstern/2017-osx-fix


MaxMorgenstern Apr 8, 2017

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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@
/.idea/workspace.xml
/build
.DS_Store

.idea

4 changes: 3 additions & 1 deletion
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,10 @@
buildscript {
 repositories {
 mavenCentral()
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:1.2.3'
 classpath 'com.android.tools.build:gradle:2.3.1'

 // NOTE: Do not place your application dependencies here; they belong
 // in the individual module build.gradle files
Expand All@@ -19,5 +20,6 @@ allprojects {
 name "rosjava-github"
 url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
 }
 jcenter()
 }
}

4 changes: 2 additions & 2 deletions
gradle/wrapper/gradle-wrapper.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
#Fri Dec 05 12:41:53 CET 2014
#Sat Apr 08 11:19:15 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

25 changes: 25 additions & 0 deletions
libraries/libraries.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries" />
 </configuration>
 </facet>
 <facet type="java-gradle" name="Java-Gradle">
 <configuration>
 <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
 <option name="BUILDABLE" value="false" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <excludeFolder url="file://$MODULE_DIR$/.gradle" />
 <excludeFolder url="file://$MODULE_DIR$/build" />
 </content>
 <orderEntry type="inheritedJdk" />
 <orderEntry type="sourceFolder" forTests="false" />
 </component>
</module>

7 changes: 2 additions & 5 deletions
libraries/rosandroid-core/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
apply plugin: 'com.android.library'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"
 compileSdkVersion 14
 buildToolsVersion '25.0.0'
}

configurations {
 all*.exclude group: 'org.ros.rosjava_bootstrap', module: 'gradle_plugins'
}

dependencies {

 compile('org.ros.rosjava_core:rosjava:0.2.1') {
 exclude group: 'xml-apis'
 exclude group: 'junit'
 }

 compile 'org.ros.rosjava_messages:std_msgs:0.5.9'
 compile 'org.ros.rosjava_messages:rosgraph_msgs:1.11.1'
 compile 'org.ros.rosjava_messages:sensor_msgs:1.11.7'

}

124 changes: 124 additions & 0 deletions
libraries/rosandroid-core/rosandroid-core.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries:rosandroid-core" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries:rosandroid-core" />
 </configuration>
 </facet>
 <facet type="android" name="Android">
 <configuration>
 <option name="SELECTED_BUILD_VARIANT" value="debug" />
 <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
 <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
 <afterSyncTasks>
 <task>generateDebugSources</task>
 </afterSyncTasks>
 <option name="ALLOW_USER_CONFIGURATION" value="false" />
 <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
 <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
 <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
 <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
 <option name="PROJECT_TYPE" value="1" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
 <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
 <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
 <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
 <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
 </content>
 <orderEntry type="jdk" jdkName="Android API 14 Platform" jdkType="Android SDK" />
 <orderEntry type="sourceFolder" forTests="false" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_common-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="tf2_msgs-0.5.13" level="project" />
 <orderEntry type="library" exported="" name="dnsjava-2.1.1" level="project" />
 <orderEntry type="library" exported="" name="rosgraph_msgs-1.11.2" level="project" />
 <orderEntry type="library" exported="" name="rosjava_test_msgs-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="std_msgs-0.5.10" level="project" />
 <orderEntry type="library" exported="" name="commons-pool-1.6" level="project" />
 <orderEntry type="library" exported="" name="message_generation-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="geometry_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.net-2.0.0" level="project" />
 <orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
 <orderEntry type="library" exported="" name="rosjava-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="sensor_msgs-1.11.7" level="project" />
 <orderEntry type="library" exported="" name="nav_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.codec-1.3.0" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_client-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="guava-12.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.logging-1.1.1" level="project" />
 <orderEntry type="library" exported="" name="ws-commons-util-1.0.1" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_server-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="netty-3.5.2.Final" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.io-1.4.0" level="project" />
 <orderEntry type="library" exported="" name="actionlib_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.lang-2.4.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.httpclient-3.1.0" level="project" />
 </component>
</module>

17 changes: 8 additions & 9 deletions
rosandroid-example-app/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
apply plugin: 'com.android.application'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"

 compileSdkVersion 14
 buildToolsVersion '25.0.0'
 defaultConfig {
 applicationId "org.ollide.rosandroid"
 applicationId 'org.ollide.rosandroid'
 // Android 4.0+ http://dannyroa.com/2013/10/17/why-its-time-to-support-only-android-4-0-and-above
 minSdkVersion 14
 targetSdkVersion 22
 targetSdkVersion 14
 versionCode 1
 versionName "1.0"
 versionName '0.1'
 }
 buildTypes {
 release {
 minifyEnabled true
 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 }
 }

 packagingOptions {
 /* https://github.com/rosjava/android_core/issues/194 */
 exclude 'META-INF/LICENSE.txt'
 exclude 'META-INF/NOTICE.txt'
 }
 productFlavors {
 }
}

dependencies {
 compile fileTree(dir: 'libs', include: ['*.jar'])

 compile fileTree(include: ['*.jar'], dir: 'libs')
 compile project(':libraries:rosandroid-core')
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix references and add SimpleSubscriberNode#5

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.

 Sign up for GitHub

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

 Open

MaxMorgenstern
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix references and add SimpleSubscriberNode
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d69de4a

Update gradle


MaxMorgenstern Apr 8, 2017
34b533a

Add example subscriber node


MaxMorgenstern Apr 8, 2017
f811a1e

Bugfix in logging


MaxMorgenstern Apr 8, 2017
5da098b

Merge pull request #1 from MaxMorgenstern/2017-osx-fix


MaxMorgenstern Apr 8, 2017

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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@
/.idea/workspace.xml
/build
.DS_Store

.idea

4 changes: 3 additions & 1 deletion
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,10 @@
buildscript {
 repositories {
 mavenCentral()
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:1.2.3'
 classpath 'com.android.tools.build:gradle:2.3.1'

 // NOTE: Do not place your application dependencies here; they belong
 // in the individual module build.gradle files
Expand All@@ -19,5 +20,6 @@ allprojects {
 name "rosjava-github"
 url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
 }
 jcenter()
 }
}

4 changes: 2 additions & 2 deletions
gradle/wrapper/gradle-wrapper.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
#Fri Dec 05 12:41:53 CET 2014
#Sat Apr 08 11:19:15 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

25 changes: 25 additions & 0 deletions
libraries/libraries.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries" />
 </configuration>
 </facet>
 <facet type="java-gradle" name="Java-Gradle">
 <configuration>
 <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
 <option name="BUILDABLE" value="false" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <excludeFolder url="file://$MODULE_DIR$/.gradle" />
 <excludeFolder url="file://$MODULE_DIR$/build" />
 </content>
 <orderEntry type="inheritedJdk" />
 <orderEntry type="sourceFolder" forTests="false" />
 </component>
</module>

7 changes: 2 additions & 5 deletions
libraries/rosandroid-core/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
apply plugin: 'com.android.library'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"
 compileSdkVersion 14
 buildToolsVersion '25.0.0'
}

configurations {
 all*.exclude group: 'org.ros.rosjava_bootstrap', module: 'gradle_plugins'
}

dependencies {

 compile('org.ros.rosjava_core:rosjava:0.2.1') {
 exclude group: 'xml-apis'
 exclude group: 'junit'
 }

 compile 'org.ros.rosjava_messages:std_msgs:0.5.9'
 compile 'org.ros.rosjava_messages:rosgraph_msgs:1.11.1'
 compile 'org.ros.rosjava_messages:sensor_msgs:1.11.7'

}

124 changes: 124 additions & 0 deletions
libraries/rosandroid-core/rosandroid-core.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries:rosandroid-core" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries:rosandroid-core" />
 </configuration>
 </facet>
 <facet type="android" name="Android">
 <configuration>
 <option name="SELECTED_BUILD_VARIANT" value="debug" />
 <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
 <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
 <afterSyncTasks>
 <task>generateDebugSources</task>
 </afterSyncTasks>
 <option name="ALLOW_USER_CONFIGURATION" value="false" />
 <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
 <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
 <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
 <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
 <option name="PROJECT_TYPE" value="1" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
 <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
 <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
 <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
 <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
 </content>
 <orderEntry type="jdk" jdkName="Android API 14 Platform" jdkType="Android SDK" />
 <orderEntry type="sourceFolder" forTests="false" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_common-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="tf2_msgs-0.5.13" level="project" />
 <orderEntry type="library" exported="" name="dnsjava-2.1.1" level="project" />
 <orderEntry type="library" exported="" name="rosgraph_msgs-1.11.2" level="project" />
 <orderEntry type="library" exported="" name="rosjava_test_msgs-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="std_msgs-0.5.10" level="project" />
 <orderEntry type="library" exported="" name="commons-pool-1.6" level="project" />
 <orderEntry type="library" exported="" name="message_generation-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="geometry_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.net-2.0.0" level="project" />
 <orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
 <orderEntry type="library" exported="" name="rosjava-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="sensor_msgs-1.11.7" level="project" />
 <orderEntry type="library" exported="" name="nav_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.codec-1.3.0" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_client-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="guava-12.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.logging-1.1.1" level="project" />
 <orderEntry type="library" exported="" name="ws-commons-util-1.0.1" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_server-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="netty-3.5.2.Final" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.io-1.4.0" level="project" />
 <orderEntry type="library" exported="" name="actionlib_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.lang-2.4.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.httpclient-3.1.0" level="project" />
 </component>
</module>

17 changes: 8 additions & 9 deletions
rosandroid-example-app/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
apply plugin: 'com.android.application'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"

 compileSdkVersion 14
 buildToolsVersion '25.0.0'
 defaultConfig {
 applicationId "org.ollide.rosandroid"
 applicationId 'org.ollide.rosandroid'
 // Android 4.0+ http://dannyroa.com/2013/10/17/why-its-time-to-support-only-android-4-0-and-above
 minSdkVersion 14
 targetSdkVersion 22
 targetSdkVersion 14
 versionCode 1
 versionName "1.0"
 versionName '0.1'
 }
 buildTypes {
 release {
 minifyEnabled true
 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 }
 }

 packagingOptions {
 /* https://github.com/rosjava/android_core/issues/194 */
 exclude 'META-INF/LICENSE.txt'
 exclude 'META-INF/NOTICE.txt'
 }
 productFlavors {
 }
}

dependencies {
 compile fileTree(dir: 'libs', include: ['*.jar'])

 compile fileTree(include: ['*.jar'], dir: 'libs')
 compile project(':libraries:rosandroid-core')
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix references and add SimpleSubscriberNode#5

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.

 Sign up for GitHub

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

 Open

MaxMorgenstern
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix references and add SimpleSubscriberNode
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d69de4a

Update gradle


MaxMorgenstern Apr 8, 2017
34b533a

Add example subscriber node


MaxMorgenstern Apr 8, 2017
f811a1e

Bugfix in logging


MaxMorgenstern Apr 8, 2017
5da098b

Merge pull request #1 from MaxMorgenstern/2017-osx-fix


MaxMorgenstern Apr 8, 2017

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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@
/.idea/workspace.xml
/build
.DS_Store

.idea

4 changes: 3 additions & 1 deletion
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,10 @@
buildscript {
 repositories {
 mavenCentral()
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:1.2.3'
 classpath 'com.android.tools.build:gradle:2.3.1'

 // NOTE: Do not place your application dependencies here; they belong
 // in the individual module build.gradle files
Expand All@@ -19,5 +20,6 @@ allprojects {
 name "rosjava-github"
 url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
 }
 jcenter()
 }
}

4 changes: 2 additions & 2 deletions
gradle/wrapper/gradle-wrapper.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
#Fri Dec 05 12:41:53 CET 2014
#Sat Apr 08 11:19:15 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

25 changes: 25 additions & 0 deletions
libraries/libraries.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries" />
 </configuration>
 </facet>
 <facet type="java-gradle" name="Java-Gradle">
 <configuration>
 <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
 <option name="BUILDABLE" value="false" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <excludeFolder url="file://$MODULE_DIR$/.gradle" />
 <excludeFolder url="file://$MODULE_DIR$/build" />
 </content>
 <orderEntry type="inheritedJdk" />
 <orderEntry type="sourceFolder" forTests="false" />
 </component>
</module>

7 changes: 2 additions & 5 deletions
libraries/rosandroid-core/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
apply plugin: 'com.android.library'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"
 compileSdkVersion 14
 buildToolsVersion '25.0.0'
}

configurations {
 all*.exclude group: 'org.ros.rosjava_bootstrap', module: 'gradle_plugins'
}

dependencies {

 compile('org.ros.rosjava_core:rosjava:0.2.1') {
 exclude group: 'xml-apis'
 exclude group: 'junit'
 }

 compile 'org.ros.rosjava_messages:std_msgs:0.5.9'
 compile 'org.ros.rosjava_messages:rosgraph_msgs:1.11.1'
 compile 'org.ros.rosjava_messages:sensor_msgs:1.11.7'

}

124 changes: 124 additions & 0 deletions
libraries/rosandroid-core/rosandroid-core.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries:rosandroid-core" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries:rosandroid-core" />
 </configuration>
 </facet>
 <facet type="android" name="Android">
 <configuration>
 <option name="SELECTED_BUILD_VARIANT" value="debug" />
 <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
 <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
 <afterSyncTasks>
 <task>generateDebugSources</task>
 </afterSyncTasks>
 <option name="ALLOW_USER_CONFIGURATION" value="false" />
 <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
 <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
 <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
 <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
 <option name="PROJECT_TYPE" value="1" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
 <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
 <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
 <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
 <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
 </content>
 <orderEntry type="jdk" jdkName="Android API 14 Platform" jdkType="Android SDK" />
 <orderEntry type="sourceFolder" forTests="false" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_common-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="tf2_msgs-0.5.13" level="project" />
 <orderEntry type="library" exported="" name="dnsjava-2.1.1" level="project" />
 <orderEntry type="library" exported="" name="rosgraph_msgs-1.11.2" level="project" />
 <orderEntry type="library" exported="" name="rosjava_test_msgs-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="std_msgs-0.5.10" level="project" />
 <orderEntry type="library" exported="" name="commons-pool-1.6" level="project" />
 <orderEntry type="library" exported="" name="message_generation-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="geometry_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.net-2.0.0" level="project" />
 <orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
 <orderEntry type="library" exported="" name="rosjava-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="sensor_msgs-1.11.7" level="project" />
 <orderEntry type="library" exported="" name="nav_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.codec-1.3.0" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_client-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="guava-12.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.logging-1.1.1" level="project" />
 <orderEntry type="library" exported="" name="ws-commons-util-1.0.1" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_server-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="netty-3.5.2.Final" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.io-1.4.0" level="project" />
 <orderEntry type="library" exported="" name="actionlib_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.lang-2.4.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.httpclient-3.1.0" level="project" />
 </component>
</module>

17 changes: 8 additions & 9 deletions
rosandroid-example-app/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
apply plugin: 'com.android.application'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"

 compileSdkVersion 14
 buildToolsVersion '25.0.0'
 defaultConfig {
 applicationId "org.ollide.rosandroid"
 applicationId 'org.ollide.rosandroid'
 // Android 4.0+ http://dannyroa.com/2013/10/17/why-its-time-to-support-only-android-4-0-and-above
 minSdkVersion 14
 targetSdkVersion 22
 targetSdkVersion 14
 versionCode 1
 versionName "1.0"
 versionName '0.1'
 }
 buildTypes {
 release {
 minifyEnabled true
 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 }
 }

 packagingOptions {
 /* https://github.com/rosjava/android_core/issues/194 */
 exclude 'META-INF/LICENSE.txt'
 exclude 'META-INF/NOTICE.txt'
 }
 productFlavors {
 }
}

dependencies {
 compile fileTree(dir: 'libs', include: ['*.jar'])

 compile fileTree(include: ['*.jar'], dir: 'libs')
 compile project(':libraries:rosandroid-core')
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix references and add SimpleSubscriberNode#5

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.

 Sign up for GitHub

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

 Open

MaxMorgenstern
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix references and add SimpleSubscriberNode
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d69de4a

Update gradle


MaxMorgenstern Apr 8, 2017
34b533a

Add example subscriber node


MaxMorgenstern Apr 8, 2017
f811a1e

Bugfix in logging


MaxMorgenstern Apr 8, 2017
5da098b

Merge pull request #1 from MaxMorgenstern/2017-osx-fix


MaxMorgenstern Apr 8, 2017

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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@
/.idea/workspace.xml
/build
.DS_Store

.idea

4 changes: 3 additions & 1 deletion
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,10 @@
buildscript {
 repositories {
 mavenCentral()
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:1.2.3'
 classpath 'com.android.tools.build:gradle:2.3.1'

 // NOTE: Do not place your application dependencies here; they belong
 // in the individual module build.gradle files
Expand All@@ -19,5 +20,6 @@ allprojects {
 name "rosjava-github"
 url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
 }
 jcenter()
 }
}

4 changes: 2 additions & 2 deletions
gradle/wrapper/gradle-wrapper.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
#Fri Dec 05 12:41:53 CET 2014
#Sat Apr 08 11:19:15 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

25 changes: 25 additions & 0 deletions
libraries/libraries.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries" />
 </configuration>
 </facet>
 <facet type="java-gradle" name="Java-Gradle">
 <configuration>
 <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
 <option name="BUILDABLE" value="false" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <excludeFolder url="file://$MODULE_DIR$/.gradle" />
 <excludeFolder url="file://$MODULE_DIR$/build" />
 </content>
 <orderEntry type="inheritedJdk" />
 <orderEntry type="sourceFolder" forTests="false" />
 </component>
</module>

7 changes: 2 additions & 5 deletions
libraries/rosandroid-core/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
apply plugin: 'com.android.library'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"
 compileSdkVersion 14
 buildToolsVersion '25.0.0'
}

configurations {
 all*.exclude group: 'org.ros.rosjava_bootstrap', module: 'gradle_plugins'
}

dependencies {

 compile('org.ros.rosjava_core:rosjava:0.2.1') {
 exclude group: 'xml-apis'
 exclude group: 'junit'
 }

 compile 'org.ros.rosjava_messages:std_msgs:0.5.9'
 compile 'org.ros.rosjava_messages:rosgraph_msgs:1.11.1'
 compile 'org.ros.rosjava_messages:sensor_msgs:1.11.7'

}

124 changes: 124 additions & 0 deletions
libraries/rosandroid-core/rosandroid-core.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries:rosandroid-core" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries:rosandroid-core" />
 </configuration>
 </facet>
 <facet type="android" name="Android">
 <configuration>
 <option name="SELECTED_BUILD_VARIANT" value="debug" />
 <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
 <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
 <afterSyncTasks>
 <task>generateDebugSources</task>
 </afterSyncTasks>
 <option name="ALLOW_USER_CONFIGURATION" value="false" />
 <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
 <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
 <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
 <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
 <option name="PROJECT_TYPE" value="1" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
 <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
 <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
 <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
 <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
 </content>
 <orderEntry type="jdk" jdkName="Android API 14 Platform" jdkType="Android SDK" />
 <orderEntry type="sourceFolder" forTests="false" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_common-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="tf2_msgs-0.5.13" level="project" />
 <orderEntry type="library" exported="" name="dnsjava-2.1.1" level="project" />
 <orderEntry type="library" exported="" name="rosgraph_msgs-1.11.2" level="project" />
 <orderEntry type="library" exported="" name="rosjava_test_msgs-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="std_msgs-0.5.10" level="project" />
 <orderEntry type="library" exported="" name="commons-pool-1.6" level="project" />
 <orderEntry type="library" exported="" name="message_generation-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="geometry_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.net-2.0.0" level="project" />
 <orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
 <orderEntry type="library" exported="" name="rosjava-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="sensor_msgs-1.11.7" level="project" />
 <orderEntry type="library" exported="" name="nav_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.codec-1.3.0" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_client-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="guava-12.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.logging-1.1.1" level="project" />
 <orderEntry type="library" exported="" name="ws-commons-util-1.0.1" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_server-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="netty-3.5.2.Final" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.io-1.4.0" level="project" />
 <orderEntry type="library" exported="" name="actionlib_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.lang-2.4.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.httpclient-3.1.0" level="project" />
 </component>
</module>

17 changes: 8 additions & 9 deletions
rosandroid-example-app/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
apply plugin: 'com.android.application'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"

 compileSdkVersion 14
 buildToolsVersion '25.0.0'
 defaultConfig {
 applicationId "org.ollide.rosandroid"
 applicationId 'org.ollide.rosandroid'
 // Android 4.0+ http://dannyroa.com/2013/10/17/why-its-time-to-support-only-android-4-0-and-above
 minSdkVersion 14
 targetSdkVersion 22
 targetSdkVersion 14
 versionCode 1
 versionName "1.0"
 versionName '0.1'
 }
 buildTypes {
 release {
 minifyEnabled true
 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 }
 }

 packagingOptions {
 /* https://github.com/rosjava/android_core/issues/194 */
 exclude 'META-INF/LICENSE.txt'
 exclude 'META-INF/NOTICE.txt'
 }
 productFlavors {
 }
}

dependencies {
 compile fileTree(dir: 'libs', include: ['*.jar'])

 compile fileTree(include: ['*.jar'], dir: 'libs')
 compile project(':libraries:rosandroid-core')
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix references and add SimpleSubscriberNode#5

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.

 Sign up for GitHub

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

 Open

MaxMorgenstern
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix references and add SimpleSubscriberNode
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d69de4a

Update gradle


MaxMorgenstern Apr 8, 2017
34b533a

Add example subscriber node


MaxMorgenstern Apr 8, 2017
f811a1e

Bugfix in logging


MaxMorgenstern Apr 8, 2017
5da098b

Merge pull request #1 from MaxMorgenstern/2017-osx-fix


MaxMorgenstern Apr 8, 2017

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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@
/.idea/workspace.xml
/build
.DS_Store

.idea

4 changes: 3 additions & 1 deletion
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,10 @@
buildscript {
 repositories {
 mavenCentral()
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:1.2.3'
 classpath 'com.android.tools.build:gradle:2.3.1'

 // NOTE: Do not place your application dependencies here; they belong
 // in the individual module build.gradle files
Expand All@@ -19,5 +20,6 @@ allprojects {
 name "rosjava-github"
 url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
 }
 jcenter()
 }
}

4 changes: 2 additions & 2 deletions
gradle/wrapper/gradle-wrapper.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
#Fri Dec 05 12:41:53 CET 2014
#Sat Apr 08 11:19:15 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

25 changes: 25 additions & 0 deletions
libraries/libraries.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries" />
 </configuration>
 </facet>
 <facet type="java-gradle" name="Java-Gradle">
 <configuration>
 <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
 <option name="BUILDABLE" value="false" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <excludeFolder url="file://$MODULE_DIR$/.gradle" />
 <excludeFolder url="file://$MODULE_DIR$/build" />
 </content>
 <orderEntry type="inheritedJdk" />
 <orderEntry type="sourceFolder" forTests="false" />
 </component>
</module>

7 changes: 2 additions & 5 deletions
libraries/rosandroid-core/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
apply plugin: 'com.android.library'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"
 compileSdkVersion 14
 buildToolsVersion '25.0.0'
}

configurations {
 all*.exclude group: 'org.ros.rosjava_bootstrap', module: 'gradle_plugins'
}

dependencies {

 compile('org.ros.rosjava_core:rosjava:0.2.1') {
 exclude group: 'xml-apis'
 exclude group: 'junit'
 }

 compile 'org.ros.rosjava_messages:std_msgs:0.5.9'
 compile 'org.ros.rosjava_messages:rosgraph_msgs:1.11.1'
 compile 'org.ros.rosjava_messages:sensor_msgs:1.11.7'

}

124 changes: 124 additions & 0 deletions
libraries/rosandroid-core/rosandroid-core.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries:rosandroid-core" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries:rosandroid-core" />
 </configuration>
 </facet>
 <facet type="android" name="Android">
 <configuration>
 <option name="SELECTED_BUILD_VARIANT" value="debug" />
 <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
 <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
 <afterSyncTasks>
 <task>generateDebugSources</task>
 </afterSyncTasks>
 <option name="ALLOW_USER_CONFIGURATION" value="false" />
 <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
 <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
 <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
 <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
 <option name="PROJECT_TYPE" value="1" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
 <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
 <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
 <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
 <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
 </content>
 <orderEntry type="jdk" jdkName="Android API 14 Platform" jdkType="Android SDK" />
 <orderEntry type="sourceFolder" forTests="false" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_common-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="tf2_msgs-0.5.13" level="project" />
 <orderEntry type="library" exported="" name="dnsjava-2.1.1" level="project" />
 <orderEntry type="library" exported="" name="rosgraph_msgs-1.11.2" level="project" />
 <orderEntry type="library" exported="" name="rosjava_test_msgs-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="std_msgs-0.5.10" level="project" />
 <orderEntry type="library" exported="" name="commons-pool-1.6" level="project" />
 <orderEntry type="library" exported="" name="message_generation-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="geometry_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.net-2.0.0" level="project" />
 <orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
 <orderEntry type="library" exported="" name="rosjava-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="sensor_msgs-1.11.7" level="project" />
 <orderEntry type="library" exported="" name="nav_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.codec-1.3.0" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_client-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="guava-12.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.logging-1.1.1" level="project" />
 <orderEntry type="library" exported="" name="ws-commons-util-1.0.1" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_server-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="netty-3.5.2.Final" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.io-1.4.0" level="project" />
 <orderEntry type="library" exported="" name="actionlib_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.lang-2.4.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.httpclient-3.1.0" level="project" />
 </component>
</module>

17 changes: 8 additions & 9 deletions
rosandroid-example-app/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
apply plugin: 'com.android.application'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"

 compileSdkVersion 14
 buildToolsVersion '25.0.0'
 defaultConfig {
 applicationId "org.ollide.rosandroid"
 applicationId 'org.ollide.rosandroid'
 // Android 4.0+ http://dannyroa.com/2013/10/17/why-its-time-to-support-only-android-4-0-and-above
 minSdkVersion 14
 targetSdkVersion 22
 targetSdkVersion 14
 versionCode 1
 versionName "1.0"
 versionName '0.1'
 }
 buildTypes {
 release {
 minifyEnabled true
 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 }
 }

 packagingOptions {
 /* https://github.com/rosjava/android_core/issues/194 */
 exclude 'META-INF/LICENSE.txt'
 exclude 'META-INF/NOTICE.txt'
 }
 productFlavors {
 }
}

dependencies {
 compile fileTree(dir: 'libs', include: ['*.jar'])

 compile fileTree(include: ['*.jar'], dir: 'libs')
 compile project(':libraries:rosandroid-core')
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix references and add SimpleSubscriberNode#5

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.

 Sign up for GitHub

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

 Open

MaxMorgenstern
wants to merge
4
commits into

base:master
Choose a base branch

from

 Open


Fix references and add SimpleSubscriberNode
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
d69de4a

Update gradle


MaxMorgenstern Apr 8, 2017
34b533a

Add example subscriber node


MaxMorgenstern Apr 8, 2017
f811a1e

Bugfix in logging


MaxMorgenstern Apr 8, 2017
5da098b

Merge pull request #1 from MaxMorgenstern/2017-osx-fix


MaxMorgenstern Apr 8, 2017

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


2 changes: 2 additions & 0 deletions
.gitignore

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,3 +3,5 @@
/.idea/workspace.xml
/build
.DS_Store

.idea

4 changes: 3 additions & 1 deletion
build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,9 +3,10 @@
buildscript {
 repositories {
 mavenCentral()
 jcenter()
 }
 dependencies {
 classpath 'com.android.tools.build:gradle:1.2.3'
 classpath 'com.android.tools.build:gradle:2.3.1'

 // NOTE: Do not place your application dependencies here; they belong
 // in the individual module build.gradle files
Expand All@@ -19,5 +20,6 @@ allprojects {
 name "rosjava-github"
 url "https://github.com/rosjava/rosjava_mvn_repo/raw/master"
 }
 jcenter()
 }
}

4 changes: 2 additions & 2 deletions
gradle/wrapper/gradle-wrapper.properties

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
#Fri Dec 05 12:41:53 CET 2014
#Sat Apr 08 11:19:15 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

25 changes: 25 additions & 0 deletions
libraries/libraries.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries" />
 </configuration>
 </facet>
 <facet type="java-gradle" name="Java-Gradle">
 <configuration>
 <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
 <option name="BUILDABLE" value="false" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <excludeFolder url="file://$MODULE_DIR$/.gradle" />
 <excludeFolder url="file://$MODULE_DIR$/build" />
 </content>
 <orderEntry type="inheritedJdk" />
 <orderEntry type="sourceFolder" forTests="false" />
 </component>
</module>

7 changes: 2 additions & 5 deletions
libraries/rosandroid-core/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
apply plugin: 'com.android.library'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"
 compileSdkVersion 14
 buildToolsVersion '25.0.0'
}

configurations {
 all*.exclude group: 'org.ros.rosjava_bootstrap', module: 'gradle_plugins'
}

dependencies {

 compile('org.ros.rosjava_core:rosjava:0.2.1') {
 exclude group: 'xml-apis'
 exclude group: 'junit'
 }

 compile 'org.ros.rosjava_messages:std_msgs:0.5.9'
 compile 'org.ros.rosjava_messages:rosgraph_msgs:1.11.1'
 compile 'org.ros.rosjava_messages:sensor_msgs:1.11.7'

}

124 changes: 124 additions & 0 deletions
libraries/rosandroid-core/rosandroid-core.iml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":libraries:rosandroid-core" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
 <component name="FacetManager">
 <facet type="android-gradle" name="Android-Gradle">
 <configuration>
 <option name="GRADLE_PROJECT_PATH" value=":libraries:rosandroid-core" />
 </configuration>
 </facet>
 <facet type="android" name="Android">
 <configuration>
 <option name="SELECTED_BUILD_VARIANT" value="debug" />
 <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
 <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
 <afterSyncTasks>
 <task>generateDebugSources</task>
 </afterSyncTasks>
 <option name="ALLOW_USER_CONFIGURATION" value="false" />
 <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
 <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
 <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
 <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
 <option name="PROJECT_TYPE" value="1" />
 </configuration>
 </facet>
 </component>
 <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
 <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
 <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
 <exclude-output />
 <content url="file://$MODULE_DIR$">
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
 <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
 <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
 </content>
 <orderEntry type="jdk" jdkName="Android API 14 Platform" jdkType="Android SDK" />
 <orderEntry type="sourceFolder" forTests="false" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_common-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="tf2_msgs-0.5.13" level="project" />
 <orderEntry type="library" exported="" name="dnsjava-2.1.1" level="project" />
 <orderEntry type="library" exported="" name="rosgraph_msgs-1.11.2" level="project" />
 <orderEntry type="library" exported="" name="rosjava_test_msgs-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="std_msgs-0.5.10" level="project" />
 <orderEntry type="library" exported="" name="commons-pool-1.6" level="project" />
 <orderEntry type="library" exported="" name="message_generation-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="geometry_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.net-2.0.0" level="project" />
 <orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
 <orderEntry type="library" exported="" name="rosjava-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="sensor_msgs-1.11.7" level="project" />
 <orderEntry type="library" exported="" name="nav_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.codec-1.3.0" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_client-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="guava-12.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.logging-1.1.1" level="project" />
 <orderEntry type="library" exported="" name="ws-commons-util-1.0.1" level="project" />
 <orderEntry type="library" exported="" name="apache_xmlrpc_server-0.2.1" level="project" />
 <orderEntry type="library" exported="" name="netty-3.5.2.Final" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.io-1.4.0" level="project" />
 <orderEntry type="library" exported="" name="actionlib_msgs-1.11.9" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.lang-2.4.0" level="project" />
 <orderEntry type="library" exported="" name="com.springsource.org.apache.commons.httpclient-3.1.0" level="project" />
 </component>
</module>

17 changes: 8 additions & 9 deletions
rosandroid-example-app/build.gradle

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
apply plugin: 'com.android.application'

android {
 compileSdkVersion 22
 buildToolsVersion "22.0.1"

 compileSdkVersion 14
 buildToolsVersion '25.0.0'
 defaultConfig {
 applicationId "org.ollide.rosandroid"
 applicationId 'org.ollide.rosandroid'
 // Android 4.0+ http://dannyroa.com/2013/10/17/why-its-time-to-support-only-android-4-0-and-above
 minSdkVersion 14
 targetSdkVersion 22
 targetSdkVersion 14
 versionCode 1
 versionName "1.0"
 versionName '0.1'
 }
 buildTypes {
 release {
 minifyEnabled true
 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
 }
 }

 packagingOptions {
 /* https://github.com/rosjava/android_core/issues/194 */
 exclude 'META-INF/LICENSE.txt'
 exclude 'META-INF/NOTICE.txt'
 }
 productFlavors {
 }
}

dependencies {
 compile fileTree(dir: 'libs', include: ['*.jar'])

 compile fileTree(include: ['*.jar'], dir: 'libs')
 compile project(':libraries:rosandroid-core')
}
Loading