From 32da65f910207f08f50b57ba59af9474eaad75d8 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 12 Feb 2016 11:39:27 +0100 Subject: client side support for XEP-0357: Push Notifications --- build.gradle | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) (limited to 'build.gradle') 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' + } } -- cgit v1.2.3 From 6217e33a8766650c94014b4c436a29ac1372c795 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 12 Feb 2016 23:38:30 +0100 Subject: removed gcm plugin from gradle. fixes #1693 --- build.gradle | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 4221d44e..34d63dfa 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.1' - classpath 'com.google.gms:google-services:1.5.0' + classpath 'com.android.tools.build:gradle:1.5.0' } } @@ -22,7 +21,6 @@ allprojects { } apply plugin: 'com.android.application' -apply plugin: 'com.google.gms.google-services' repositories { jcenter() @@ -37,7 +35,7 @@ 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' -- cgit v1.2.3 From 726393f8da8b5e4dd10d4a7f37339810e0a9fa6c Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Tue, 16 Feb 2016 12:59:54 +0100 Subject: version bump to 1.10.0-beta and changelog --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index 34d63dfa..ce88c410 100644 --- a/build.gradle +++ b/build.gradle @@ -58,8 +58,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 123 - versionName "1.9.4" + versionCode 124 + versionName "1.10.0-beta" archivesBaseName += "-$versionName" } -- cgit v1.2.3 From c20d8ac69eeade4d5337d958ada7910db0c6d3a0 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 21 Feb 2016 23:03:30 +0100 Subject: version bump to 1.10.0 --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'build.gradle') diff --git a/build.gradle b/build.gradle index ce88c410..deaae0e2 100644 --- a/build.gradle +++ b/build.gradle @@ -58,9 +58,10 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 23 - versionCode 124 - versionName "1.10.0-beta" + versionCode 127 + versionName "1.10.0" archivesBaseName += "-$versionName" + applicationId "eu.siacs.conversations" } compileOptions { -- cgit v1.2.3