Skip to content

now it compile! at #1

New issue

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

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

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.gradle
.idea
*.iml
local.properties
build
*log
*~
69 changes: 39 additions & 30 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,39 +1,48 @@
task wrapper(type: Wrapper) {
gradleVersion = '1.0-milestone-9'
gradleVersion = "2.2.1"
}

allprojects {
group 'ros.pr2_android_utilities'
version = '0.0.0-SNAPSHOT'
buildscript {
apply from: "https://github.com/rosjava/rosjava_bootstrap/raw/indigo/buildscript.gradle"
//noinspection GroovyAssignabilityCheck
dependencies {
classpath "com.android.tools.build:gradle:1.0.1"
}
}

subprojects {
repositories {
mavenLocal()
mavenCentral()
}

configurations.add('compile') {
exclude group: 'junit'
exclude group: 'xml-apis'
}
apply plugin: "catkin"

task deployLibs(type: Copy) {
from { configurations.compile }
into "${projectDir}/libs"
}
allprojects {
group 'org.ros.pr2_android_utilities'
version = project.catkin.pkg.version
}

task clean << {
ant.delete file: "${projectDir}/local.properties"
ant.delete file: "${projectDir}/proguard-project.txt"
ant.delete file: "${projectDir}/build.xml"
ant.delete dir: "${projectDir}/bin"
ant.delete dir: "${projectDir}/gen"
ant.delete dir: "${projectDir}/libs"
}
subprojects {

task debug(type: Exec) {
dependsOn deployLibs
commandLine 'ant', 'debug'
}
apply plugin: "ros-android"
afterEvaluate { project ->
android {
sourceSets {
//noinspection GroovyAssignabilityCheck
main {
manifest.srcFile "AndroidManifest.xml"
res.srcDirs "res"
assets.srcDirs "assets"
java.srcDirs "src"
}
}


packagingOptions {
/* https://github.com/rosjava/android_core/issues/194 */
exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt'
exclude 'META-INF/gradle-plugins/catkin.properties'
exclude 'META-INF/gradle-plugins/ros.properties'
exclude 'META-INF/gradle-plugins/ros-android.properties'
exclude 'META-INF/gradle-plugins/ros-java.properties'
}
}
}

}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
13 changes: 13 additions & 0 deletions package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0"?>
<package>
<name>pr2_android_utilities</name>
<version>0.1.0</version>
<description>
This is the stack of android applications for pr2
</description>
<maintainer email="[email protected]">Sarah Elliott</maintainer>
<author>KazutoMurase</author>
<license>Apache 2.0</license>
<url>http://ros.org/wiki/pr2_android_utilities</url>
</package>

18 changes: 18 additions & 0 deletions pr2_android_core_components/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@

//noinspection GroovyAssignabilityCheck
dependencies {
compile 'org.ros.android_core:android_gingerbread_mr1:[0.1,0.2)'
compile 'org.ros.rosjava_messages:pr2_msgs:[0,)'
compile 'org.ros.rosjava_messages:pr2_power_board:[0,)'
compile 'org.ros.rosjava_messages:std_srvs:1.10.12'
compile 'org.ros.rosjava_osrf:robot_app_components:[0.1,0.2)'
}

apply plugin: 'com.android.application'


android {
compileSdkVersion 21
}


10 changes: 0 additions & 10 deletions stack.xml

This file was deleted.