aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Whited <sam@samwhited.com>2014-10-22 18:17:49 -0400
committerSam Whited <sam@samwhited.com>2014-10-22 18:17:49 -0400
commit1f49e99c460be1a4987bbb3b77753c667410294c (patch)
tree4afae432112fbed038c2f1b6be0480cd32d5effa
parentbf0c447fec316920542948b08a8a5306173fb937 (diff)
Suppress lint errors and remove bcprov
-rw-r--r--build.gradle38
-rw-r--r--libs/bcprov-jdk15on-150.jarbin2732684 -> 0 bytes
2 files changed, 25 insertions, 13 deletions
diff --git a/build.gradle b/build.gradle
index 2352b1162..95e107387 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 d4b510d78..000000000
--- a/libs/bcprov-jdk15on-150.jar
+++ /dev/null
Binary files differ