diff options
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 44 |
1 files changed, 19 insertions, 25 deletions
diff --git a/build.gradle b/build.gradle index 0d285079d..c8d116c4f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.1' + classpath 'com.android.tools.build:gradle:1.5.0' } } @@ -27,11 +27,15 @@ repositories { mavenCentral() } +configurations { + playstoreCompile +} + dependencies { compile project(':libs:MemorizingTrustManager') compile 'org.sufficientlysecure:openpgp-api:10.0' compile 'com.soundcloud.android:android-crop:1.0.1@aar' - compile 'com.android.support:support-v13:23.0.1' + compile 'com.android.support:support-v13:23.1.1' compile 'org.bouncycastle:bcprov-jdk15on:1.52' compile 'org.bouncycastle:bcmail-jdk15on:1.52' compile 'org.jitsi:org.otr4j:0.22' @@ -47,6 +51,7 @@ dependencies { compile 'jetty:javax.servlet:5.1.12' compile 'com.google.code.gson:gson:2.3.1' compile 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' + playstoreCompile 'com.google.android.gms:play-services-gcm:8.3.0' } android { @@ -57,10 +62,9 @@ android { minSdkVersion 14 targetSdkVersion 23 - versionCode 122 - versionName "1.9.3" - - project.ext.set(archivesBaseName, archivesBaseName + "-" + versionName); + versionCode 123 + versionName "1.9.4" + archivesBaseName += "-$versionName" } compileOptions { @@ -68,15 +72,10 @@ android { targetCompatibility JavaVersion.VERSION_1_7 } - // - // To sign release builds, create the file `gradle.properties` in - // $HOME/.gradle or in your project directory with this content: - // - // mStoreFile=/path/to/key.store - // mStorePassword=xxx - // mKeyAlias=alias - // mKeyPassword=xxx - // + productFlavors { + playstore + free + } if (project.hasProperty('mStoreFile') && project.hasProperty('mStorePassword') && project.hasProperty('mKeyAlias') && @@ -94,16 +93,6 @@ android { buildTypes.release.signingConfig = null } - applicationVariants.all { variant -> - if (variant.name.equals('release')) { - variant.outputs.each { output -> - if (output.zipAlign != null) { - output.zipAlign.outputFile = new File(output.outputFile.parent, rootProject.name + "-${variant.versionName}.apk") - } - } - } - } - lintOptions { disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource' } @@ -121,4 +110,9 @@ android { } } + + packagingOptions { + exclude 'META-INF/BCKEY.DSA' + exclude 'META-INF/BCKEY.SF' + } } |