From 21069003b05b984cfe67f9f6f8479c97a803e3da Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Mon, 3 Nov 2014 19:56:38 +0100
Subject: [PATCH] disabled proguard. fixed gradle libs

---
 build.gradle    | 11 +++--------
 settings.gradle |  6 +++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index fd5805e80..a37b92c4b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,13 +28,12 @@ repositories {
 }
 
 dependencies {
-	compile project(':libs/minidns')
-	compile project(':libs/openpgp-api-lib')
-	compile project(':libs/MemorizingTrustManager')
+	compile project(':libs:minidns')
+	compile project(':libs:openpgp-api-lib')
+	compile project(':libs:MemorizingTrustManager')
 	compile 'com.android.support:support-v13:19.1.0'
 	compile 'org.bouncycastle:bcprov-jdk15on:1.50'
 	compile 'net.java:otr4j:0.21'
-	compile fileTree(dir: 'libs', include: ['*.jar'])
 }
 
 android {
@@ -80,10 +79,6 @@ android {
 	}
 
 	buildTypes {
-		release {
-			runProguard true
-			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-		}
 		applicationVariants.all { variant ->
 			def fileName = variant.packageApplication.outputFile.name.replace(".apk",
 					"-" + defaultConfig.versionName + ".apk")
diff --git a/settings.gradle b/settings.gradle
index 45b0e9e03..5a34181a4 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
-include ':libs/MemorizingTrustManager'
-include ':libs/minidns'
-include ':libs/openpgp-api-lib'
+include ':libs:MemorizingTrustManager'
+include ':libs:minidns'
+include ':libs:openpgp-api-lib'
 
 rootProject.name = 'Conversations'