From 1f49e99c460be1a4987bbb3b77753c667410294c Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Wed, 22 Oct 2014 18:17:49 -0400
Subject: Suppress lint errors and remove bcprov

---
 build.gradle                |  38 +++++++++++++++++++++++++-------------
 libs/bcprov-jdk15on-150.jar | Bin 2732684 -> 0 bytes
 2 files changed, 25 insertions(+), 13 deletions(-)
 delete mode 100644 libs/bcprov-jdk15on-150.jar

diff --git a/build.gradle b/build.gradle
index 2352b116..95e10738 100644
--- a/build.gradle
+++ b/build.gradle
@@ -20,9 +20,19 @@ allprojects {
 apply plugin: 'android'
 
 repositories {
+	jcenter()
 	mavenCentral()
 }
 
+dependencies {
+	compile project(':minidns')
+	compile project(':openpgpapilib')
+	compile project(':memorizingTrustManager')
+	compile 'com.android.support:support-v13:19.1.0'
+	compile 'org.bouncycastle:bcprov-jdk15on:1.50'
+	compile fileTree(dir: 'libs', include: ['*.jar'])
+}
+
 android {
 	compileSdkVersion 19
 	buildToolsVersion "19.1"
@@ -40,22 +50,24 @@ android {
 	}
 	buildTypes {
 		release {
-			runProguard true
-			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-		}
-		debug {
 			runProguard false
 			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
 		}
 	}
-}
+	lintOptions {
+		disable 'MissingTranslation', 'InvalidPackage'
+	}
+	subprojects {
 
-dependencies {
-	compile project(':minidns')
-	compile project(':openpgpapilib')
-	compile project(':memorizingTrustManager')
-	compile 'com.android.support:support-v13:19.1.0'
-	// compile files('libs/bcprov-jdk15on-150.jar')
-	// compile files('libs/otr4j-0.10.jar')
-	compile fileTree(dir: 'libs', include: ['*.jar'])
+		afterEvaluate {
+			if (getPlugins().hasPlugin('android') ||
+					getPlugins().hasPlugin('android-library')) {
+
+				configure(android.lintOptions) {
+					disable 'AndroidGradlePluginVersion', 'MissingTranslation'
+				}
+			}
+
+		}
+	}
 }
diff --git a/libs/bcprov-jdk15on-150.jar b/libs/bcprov-jdk15on-150.jar
deleted file mode 100644
index d4b510d7..00000000
Binary files a/libs/bcprov-jdk15on-150.jar and /dev/null differ
-- 
cgit v1.2.3