From 665e306c2162e1878d83f109154472e2993cf232 Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@nurfuerspam.de>
Date: Thu, 11 Jun 2015 22:16:38 +0200
Subject: [PATCH] Radiobeacon: Use gradle

---
 metadata/org.openbmap.txt | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/metadata/org.openbmap.txt b/metadata/org.openbmap.txt
index e4d70a7bae..493b664ea1 100644
--- a/metadata/org.openbmap.txt
+++ b/metadata/org.openbmap.txt
@@ -70,14 +70,13 @@ Build:0.8.4,12
     prebuild=sed -i -e 's/0.4.3/0.5.0-rc1/g' -e '/svg-android/d' build.gradle
 
 Build:0.8.5,13
-    disable=resource error
-    commit=v0.8.5
-    subdir=android
-    patch=openbmap-gradle.patch
+    disable=res already defined
+    commit=6065846cbfcb
+    subdir=android/app
     gradle=yes
-    rm=android/libs/*jar
-    prebuild=sed -i -e 's/0.4.3/0.5.1/g' -e '/svg-android/d' build.gradle
-
+    rm=android/app/libs/*.jar
+    prebuild=sed -i -e '/jar/d' -e 's/minSdkVersion 8/minSdkVersion 9/g' -e '/support-v4/acompile "com.caverock:androidsvg:1.2.1"\ncompile "org.apache.commons:commons-lang3:3.4"\ncompile "org.apache.httpcomponents:httpmime:4.2.3"\ncompile "com.jjoe64:graphview:3.1.3"\ncompile "org.mapsforge:mapsforge-core:0.5.1"\ncompile "org.mapsforge:mapsforge-map:0.5.1"\ncompile "org.mapsforge:mapsforge-map-reader:0.5.1"\ncompile "org.mapsforge:mapsforge-map-android:0.5.1"' build.gradle && \
+        rm ../local.properties
 Maintainer Notes:
 Upstream is using ant, but building mapsforge from source requires gradle, which fails
 on the build server if called in an ant or maven project (or when called multiple times).