aboutsummaryrefslogtreecommitdiffstats
path: root/build.gradle
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--build.gradle37
1 files changed, 17 insertions, 20 deletions
diff --git a/build.gradle b/build.gradle
index 85be3305..4221d44e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.1'
+ classpath 'com.google.gms:google-services:1.5.0'
}
}
@@ -21,12 +22,17 @@ allprojects {
}
apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
repositories {
jcenter()
mavenCentral()
}
+configurations {
+ playstoreCompile
+}
+
dependencies {
compile project(':libs:MemorizingTrustManager')
compile 'org.sufficientlysecure:openpgp-api:10.0'
@@ -44,6 +50,7 @@ dependencies {
compile 'com.kyleduo.switchbutton:library:1.2.8'
compile 'org.whispersystems:axolotl-android:1.3.4'
compile 'com.makeramen:roundedimageview:2.2.0'
+ playstoreCompile 'com.google.android.gms:play-services-gcm:8.3.0'
}
android {
@@ -55,7 +62,7 @@ android {
targetSdkVersion 23
versionCode 123
versionName "1.9.4"
- project.ext.set(archivesBaseName, archivesBaseName + "-" + versionName);
+ archivesBaseName += "-$versionName"
}
compileOptions {
@@ -63,15 +70,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') &&
@@ -89,16 +91,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'
}
@@ -116,4 +108,9 @@ android {
}
}
+
+ packagingOptions {
+ exclude 'META-INF/BCKEY.DSA'
+ exclude 'META-INF/BCKEY.SF'
+ }
}