From b396ba1ae1a908af0939b13772201590f87f1fe8 Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 8 Jun 2019 15:14:41 +0200
Subject: [PATCH] version 2.2.4 beta + changes

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00a0b281a..3409deaef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 * added channel search via search.jabbercat.org
 * reworked onboarding screens
 * warn when trying to enter domain address or channel address in Add Contact dialog
-* set own OMEMO devices to inactive after not seeing them for 14 days. (was 7 days)
+* set own OMEMO devices to inactive after not seeing them for 60 days. (was 7 days)
 * bug fixes
 
 #### Version 2.2.3
diff --git a/build.gradle b/build.gradle
index 98eb85f69..ee0245283 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 
@@ -101,8 +101,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 28
 
-        versionCode 259
-        versionName "2.2.4 beta (2019-05-18)"
+        versionCode 261
+        versionName "2.2.4 beta (2019-06-08)"
 
         archivesBaseName += "-$versionName"
         applicationId "de.pixart.messenger"
@@ -120,7 +120,7 @@ android {
     dexOptions {
         // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
         preDexLibraries = preDexEnabled && !travisBuild
-        javaMaxHeapSize "4g"
+        javaMaxHeapSize "8g"
         jumboMode true
     }
 
@@ -173,6 +173,7 @@ android {
 
     lintOptions {
         disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource', 'RestrictedApi'
+        //abortOnError false
     }
 
     subprojects {