From c5a7e25c8c2769e7b07c8d433f9bac7099239749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 1 Jul 2014 19:34:31 +0200
Subject: [PATCH] Remove all usage of @dir in gradle builds

---
 metadata/com.stevenschoen.putionew.txt |  2 +-
 metadata/de.skubware.opentraining.txt  | 13 +++++++++----
 metadata/net.cyclestreets.txt          |  2 +-
 metadata/org.adaway.txt                |  8 ++++----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/metadata/com.stevenschoen.putionew.txt b/metadata/com.stevenschoen.putionew.txt
index e4b118583d..db8e575fa3 100644
--- a/metadata/com.stevenschoen.putionew.txt
+++ b/metadata/com.stevenschoen.putionew.txt
@@ -18,7 +18,7 @@ Build:2.0.0-beta1,59
     commit=2.0_beta_1
     subdir=app
     submodules=yes
-    gradle=yes@..
+    gradle=yes
     srclibs=CastCompanion@v1.0
     prebuild=sed -i 's@android {@android { lintOptions { abortOnError false }@' build.gradle
 
diff --git a/metadata/de.skubware.opentraining.txt b/metadata/de.skubware.opentraining.txt
index 64cc734611..1c88d9485f 100644
--- a/metadata/de.skubware.opentraining.txt
+++ b/metadata/de.skubware.opentraining.txt
@@ -72,21 +72,26 @@ Build:0.6,22
 Build:0.6.2,25
     commit=v0.6.2
     subdir=app
-    gradle=yes@..
+    gradle=yes
+    prebuild=mv ../build.gradle . && \
+        sed -i -e 's@app/@@g' build.gradle
 
 Build:0.7,26
     commit=v0.7
     subdir=app
-    gradle=yes@..
+    gradle=yes
+    prebuild=mv ../build.gradle . && \
+        sed -i -e 's@app/@@g' build.gradle
 
 Build:0.7.1,27
     commit=v0.7.1
     subdir=app
-    gradle=yes@..
+    gradle=yes
     srclibs=NineOldAndroids@2.4.0
     rm=app/libs/acra-4.5.0.jar,app/libs/nineoldandroids-2.4.0.jar
     prebuild=cp -r $$NineOldAndroids$$/src/com  src/ && \
-         sed -i -e '/versionCode 1/d' -e '/versionName "1.0"/d' ../build.gradle
+        mv ../build.gradle . && \
+        sed -i -e '/versionCode 1/d' -e '/versionName "1.0"/d' -e 's@app/@@g' build.gradle
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/net.cyclestreets.txt b/metadata/net.cyclestreets.txt
index 5a2053b5f5..149a21a419 100644
--- a/metadata/net.cyclestreets.txt
+++ b/metadata/net.cyclestreets.txt
@@ -33,7 +33,7 @@ Build:2.1,17
     disable=https://github.com/cyclestreets/android/issues/84
     commit=RELEASE_2_1
     subdir=cyclestreets
-    gradle=yes@..
+    gradle=yes
 
 Auto Update Mode:None
 Update Check Mode:Tags
diff --git a/metadata/org.adaway.txt b/metadata/org.adaway.txt
index 9d61455d12..2179055853 100644
--- a/metadata/org.adaway.txt
+++ b/metadata/org.adaway.txt
@@ -184,28 +184,28 @@ Build:2.3,42
 Build:2.6,45
     commit=v2.6
     subdir=AdAway
-    gradle=yes@..
+    gradle=yes
     buildjni=yes
     preassemble=renameExecutables
 
 Build:2.7,46
     commit=v2.7
     subdir=AdAway
-    gradle=yes@..
+    gradle=yes
     buildjni=yes
     preassemble=renameExecutables
 
 Build:2.8,47
     commit=v2.8
     subdir=AdAway
-    gradle=yes@..
+    gradle=yes
     buildjni=yes
     preassemble=renameExecutables
 
 Build:2.8.1,48
     commit=v2.8.1
     subdir=AdAway
-    gradle=yes@..
+    gradle=yes
     buildjni=yes
     preassemble=renameExecutables