From 79858278e0811f6312809efd781dafd229dabec9 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 18 Feb 2017 18:08:01 +0100 Subject: [PATCH] version bump to 1.16.2 + changelog --- CHANGELOG.md | 5 +++++ build.gradle | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 804712eac..f610a4cfb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ ###Changelog +####Version 1.16.2 +* change mam catchup strategie. support mam:1 +* bug fixes + + ####Version 1.16.1 * UI performance fixes * bug fixes diff --git a/build.gradle b/build.gradle index 2eae99ca6..361a0878f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:2.0.0' + classpath 'com.android.tools.build:gradle:2.2.3' } } @@ -26,7 +26,7 @@ dependencies { playstoreCompile 'com.google.android.gms:play-services-gcm:10.0.1' compile 'org.sufficientlysecure:openpgp-api:10.0' compile 'com.soundcloud.android:android-crop:1.0.1@aar' - compile 'com.android.support:support-v13:25.1.0' + compile 'com.android.support:support-v13:25.1.1' compile 'org.bouncycastle:bcprov-jdk15on:1.52' compile 'org.bouncycastle:bcmail-jdk15on:1.52' compile 'org.jitsi:org.otr4j:0.22' @@ -35,7 +35,7 @@ dependencies { compile 'com.google.zxing:android-integration:3.2.1' compile 'de.measite.minidns:minidns:0.1.7' compile 'de.timroes.android:EnhancedListView:0.3.4' - compile 'me.leolin:ShortcutBadger:1.1.13@aar' + compile 'me.leolin:ShortcutBadger:1.1.12@aar' compile 'com.kyleduo.switchbutton:library:1.2.8' compile 'org.whispersystems:axolotl-android:1.3.4' compile 'com.makeramen:roundedimageview:2.2.0' @@ -56,8 +56,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 25 - versionCode 197 - versionName "1.16.1" + versionCode 199 + versionName "1.16.2" archivesBaseName += "-$versionName" applicationId "eu.siacs.conversations" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 61de9bb3c..1efda2265 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip