From 002d09f0e75d2285a74e578f5e3fa446c04d65ac Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <m.hoffmann@cartelsol.com>
Date: Sat, 2 Sep 2017 18:09:16 +0200
Subject: [PATCH] com.namelessdev.mpdroid: add version 1.08 b4

Update the 1.07.2 recipe, the gradle workaround is not needed anymore.
---
 metadata/com.namelessdev.mpdroid.txt          | 14 ++++--
 ...001-remove-fabric.io-and-crashlytics.patch | 48 +++++++++++++++++++
 .../0002-remove-versionName-logic.patch       | 34 +++++++++++++
 3 files changed, 92 insertions(+), 4 deletions(-)
 create mode 100644 metadata/com.namelessdev.mpdroid/0001-remove-fabric.io-and-crashlytics.patch
 create mode 100644 metadata/com.namelessdev.mpdroid/0002-remove-versionName-logic.patch

diff --git a/metadata/com.namelessdev.mpdroid.txt b/metadata/com.namelessdev.mpdroid.txt
index f2d4aca6aa..968b4c4d20 100644
--- a/metadata/com.namelessdev.mpdroid.txt
+++ b/metadata/com.namelessdev.mpdroid.txt
@@ -77,14 +77,20 @@ Build:1.06,40
 Build:1.07.2,54
     commit=1_07_2_final
     subdir=MPDroid
-    init=sed -i '/crashlytics/d' build.gradle && \
-        sed -i '/gradleVersion/d' ../build.gradle
     gradle=foss
     forceversion=yes
+    prebuild=sed -i '/crashlytics/d' build.gradle
+
+Build:1.08 Beta 4,58
+    commit=1_08_b4
+    subdir=MPDroid
+    patch=0001-remove-fabric.io-and-crashlytics.patch,0002-remove-versionName-logic.patch
+    gradle=foss
 
 Maintainer Notes:
-Remove the gradleVersion sed once it is set up correctly (using 2.1 instead of
-the correct 2.2 in 1.07.2)
+From version 1.08 forceversion doesn't work because it replaces to much in
+build.gradle, so we use a patch that removes the unwanted version calculation
+logic from the file instead.
 .
 
 Auto Update Mode:None
diff --git a/metadata/com.namelessdev.mpdroid/0001-remove-fabric.io-and-crashlytics.patch b/metadata/com.namelessdev.mpdroid/0001-remove-fabric.io-and-crashlytics.patch
new file mode 100644
index 0000000000..8399d3747f
--- /dev/null
+++ b/metadata/com.namelessdev.mpdroid/0001-remove-fabric.io-and-crashlytics.patch
@@ -0,0 +1,48 @@
+From 2d91537327042f0555984fdb32c7f2abe1c2e848 Mon Sep 17 00:00:00 2001
+From: Marcus Hoffmann <m.hoffmann@cartelsol.com>
+Date: Sat, 2 Sep 2017 17:51:20 +0200
+Subject: [PATCH] remove fabric.io and crashlytics
+
+---
+ MPDroid/build.gradle | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/MPDroid/build.gradle b/MPDroid/build.gradle
+index 40d6285c..2b7df2f0 100644
+--- a/MPDroid/build.gradle
++++ b/MPDroid/build.gradle
+@@ -17,21 +17,9 @@ import java.awt.HeadlessException
+  */
+ 
+ apply plugin: 'com.android.application'
+-apply plugin: 'io.fabric'
+-
+-buildscript {
+-    repositories {
+-        maven { url 'https://maven.fabric.io/public' }
+-    }
+-
+-    dependencies {
+-        classpath 'io.fabric.tools:gradle:1.+'
+-    }
+-}
+ 
+ repositories {
+     mavenCentral()
+-    maven { url 'https://maven.fabric.io/public' }
+ }
+ 
+ def gitShortHash() {
+@@ -126,9 +114,6 @@ dependencies {
+     compile project(':JMPDCommAndroid')
+     // Libraries from maven
+     compile 'asia.ivity.android:drag-sort-listview:1.0'
+-    closedbitsCompile('com.crashlytics.sdk.android:crashlytics:2.4.0@aar') {
+-        transitive = true
+-    }
+ }
+ 
+ class BrowseJavadoc implements TaskExecutionListener {
+-- 
+2.11.0
+
diff --git a/metadata/com.namelessdev.mpdroid/0002-remove-versionName-logic.patch b/metadata/com.namelessdev.mpdroid/0002-remove-versionName-logic.patch
new file mode 100644
index 0000000000..201a39b855
--- /dev/null
+++ b/metadata/com.namelessdev.mpdroid/0002-remove-versionName-logic.patch
@@ -0,0 +1,34 @@
+From 1af84e559618e239d325c51922057a76d6a11211 Mon Sep 17 00:00:00 2001
+From: Marcus Hoffmann <m.hoffmann@cartelsol.com>
+Date: Sat, 2 Sep 2017 18:00:01 +0200
+Subject: [PATCH] remove versionName logic
+
+---
+ MPDroid/build.gradle | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/MPDroid/build.gradle b/MPDroid/build.gradle
+index 40d6285c..f120f414 100644
+--- a/MPDroid/build.gradle
++++ b/MPDroid/build.gradle
+@@ -34,7 +34,7 @@ android {
+         minSdkVersion 16
+         targetSdkVersion 23
+         versionCode 58
+-        versionName "1.08 Beta 4 " + gitShortHash()
++        versionName "1.08 Beta 4"
+     }
+ 
+     lintOptions {
+@@ -60,7 +60,7 @@ android {
+         }
+ 
+         foss {
+-            versionName defaultConfig.versionName + "-f"
++            versionName defaultConfig.versionName
+             ext.enableCrashlytics = false
+         }
+     }
+-- 
+2.11.0
+