From c2faf75ce3e84a29c4b21c82d377de5efb29c13f Mon Sep 17 00:00:00 2001
From: Eric Kok <erickok@gmail.com>
Date: Thu, 4 Oct 2018 10:06:34 +0200
Subject: [PATCH] Fix release builds by pointing AndoridAnnotations to the
 right AndroidManifest; also adding explicitly the legacy Apache HttpClient
 usage. Preparing new release.

---
 app/build.gradle                 | 18 +++++++++++++++---
 app/src/main/AndroidManifest.xml |  4 ++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 5b656d80..796e06cb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,17 +8,29 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 230
-        versionName '2.5.10'
+        versionCode 231
+        versionName '2.5.11'
 
         javaCompileOptions {
             annotationProcessorOptions {
-                arguments = ["resourcePackageName": "org.transdroid"]
+                arguments = [
+                        "resourcePackageName": "org.transdroid",
+                        "androidManifestFile": "/Users/erickok/Android/2312/transdroid/app/src/main/AndroidManifest.xml"
+                ]
             }
         }
     }
+    signingConfigs {
+        releaseConfig {
+            keyAlias 'transdroid'
+            keyPassword ''
+            storeFile file('../../erickok.keystore')
+            storePassword ''
+        }
+    }
     buildTypes {
         release {
+            signingConfig signingConfigs.releaseConfig
             minifyEnabled false
         }
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f697453b..d55663f2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -51,6 +51,10 @@
 		android:label="@string/app_name"
 		android:theme="@style/Theme.AppCompat" >
 
+		<uses-library
+				android:name="org.apache.http.legacy"
+				android:required="false" />
+
 		<!-- Main activities -->
 		<activity
 			android:name="org.transdroid.core.gui.TorrentsActivity_"