From 6c420f4276db07dcb552fa007d286effaaa7e5a9 Mon Sep 17 00:00:00 2001
From: talregev <tal.regev@gmail.com>
Date: Fri, 13 Feb 2015 04:57:40 +0200
Subject: [PATCH 1/2] now it compile! at android-studio (windows + ubuntu)
 gradlew catkin_make

---
 .gitignore                               |  7 +++
 build.gradle                             | 69 +++++++++++++-----------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 stack.xml => package.xml                 |  7 ++-
 pr2_android_core_components/build.gradle | 18 +++++++
 5 files changed, 70 insertions(+), 33 deletions(-)
 create mode 100644 .gitignore
 rename stack.xml => package.xml (71%)
 create mode 100644 pr2_android_core_components/build.gradle

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..baee95d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+.gradle
+.idea
+*.iml
+local.properties
+build
+*log
+*~
diff --git a/build.gradle b/build.gradle
index 81253e5..24d0d7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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'
+            }
+        }
+    }
+    
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index dfa9a27..f0a78df 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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
diff --git a/stack.xml b/package.xml
similarity index 71%
rename from stack.xml
rename to package.xml
index dc054e9..ea960c7 100644
--- a/stack.xml
+++ b/package.xml
@@ -1,4 +1,7 @@
-<stack>
+<?xml version="1.0"?>
+<package>
+    <name>pr2_android_utilities</name>
+    <version>0.1.0</version>
   <description brief="pr2_android_utilities">
     This is the stack of android applications for pr2
   </description>
@@ -6,5 +9,5 @@
   <license>Apache 2.0</license>
   <review status="unreviewed" notes="" />
   <url>http://ros.org/wiki/pr2_android_utilities</url>
-</stack>
+</package>
 
diff --git a/pr2_android_core_components/build.gradle b/pr2_android_core_components/build.gradle
new file mode 100644
index 0000000..49da0c8
--- /dev/null
+++ b/pr2_android_core_components/build.gradle
@@ -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
+}
+
+

From 2cc5d22b452942528145d0d48d98e36e1c1aa57b Mon Sep 17 00:00:00 2001
From: talregev <tal.regev@gmail.com>
Date: Thu, 19 Feb 2015 14:02:25 +0200
Subject: [PATCH 2/2] package.xml file now compile with catkin_make.

---
 package.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.xml b/package.xml
index ea960c7..e6080ee 100644
--- a/package.xml
+++ b/package.xml
@@ -2,12 +2,12 @@
 <package>
     <name>pr2_android_utilities</name>
     <version>0.1.0</version>
-  <description brief="pr2_android_utilities">
+  <description>
     This is the stack of android applications for pr2
   </description>
+    <maintainer email="sarah@osrfoundation.org">Sarah Elliott</maintainer>
   <author>KazutoMurase</author>
   <license>Apache 2.0</license>
-  <review status="unreviewed" notes="" />
   <url>http://ros.org/wiki/pr2_android_utilities</url>
 </package>