From 68f23af219b15fd76ebd4e28694ea2956916ba43 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 26 Jun 2018 20:38:36 +0200
Subject: [PATCH] version bump to 2.2.4 + changelog

---
 CHANGELOG.md |  5 +++++
 build.gradle | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8906307ae..cacec3576 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+### Version 2.2.4
+* Use group chat name as primary identifier
+* Show group name and subject in group chat details
+* Upload group chat avatar on compatible servers
+
 ### Version 2.2.3
 * Introduce Expert Setting to enable direct search
 * Introduce Paste As Quote on Android 6+
diff --git a/build.gradle b/build.gradle
index aec90d54f..2020ad27a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -67,8 +67,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 274
-        versionName "2.2.3"
+        versionCode 276
+        versionName "2.2.4"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
@@ -95,15 +95,19 @@ android {
     productFlavors {
         playstore {
             dimension "distribution"
+            versionNameSuffix "-p"
         }
         free {
             dimension "distribution"
+            versionNameSuffix "-f"
         }
         system {
             dimension "emoji"
+            versionNameSuffix "s"
         }
         compat {
             dimension "emoji"
+            versionNameSuffix "c"
         }
     }
 
@@ -112,11 +116,13 @@ android {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            versionNameSuffix "r"
         }
         debug {
             shrinkResources true
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            versionNameSuffix "d"
         }
     }