diff --git a/build.gradle b/build.gradle index 2352b116212b869dbc5332f52298313b7a679d13..95e107387ac7a643282b49a2ba44436ec543e20d 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 d4b510d7894afa3775fdfb7ab2b3a704baf82c99..0000000000000000000000000000000000000000 Binary files a/libs/bcprov-jdk15on-150.jar and /dev/null differ