disabled proguard. fixed gradle libs

This commit is contained in:
iNPUTmice 2014-11-03 19:56:38 +01:00
parent 3e05ef77b1
commit 21069003b0
2 changed files with 6 additions and 11 deletions

View File

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

View File

@ -1,5 +1,5 @@
include ':libs/MemorizingTrustManager' include ':libs:MemorizingTrustManager'
include ':libs/minidns' include ':libs:minidns'
include ':libs/openpgp-api-lib' include ':libs:openpgp-api-lib'
rootProject.name = 'Conversations' rootProject.name = 'Conversations'