From 4bc9713b800e67479bc20b6c0caa60c7e555ee4b Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 16 Sep 2018 16:33:21 +0200
Subject: [PATCH] version bump to 2.3.0-beta + changelog

---
 CHANGELOG.md      |  7 +++++++
 build.gradle      |  4 ++--
 gradle.properties | 15 ---------------
 3 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 gradle.properties

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0b74a57c..48c6f3fdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### Version 2.3.0
+* Preview and ask for confirmation before sending media files
+* View per conversation media files in contact and conference details screens
+* Enable foreground service by default for Android 8 (notification can be disabled by long pressing it)
+* Audio player: disable screen and switch to ear piece
+
+
 ### Version 2.2.9
 * Store bookmarks in PEP if server has ability to convert to old bookmarks
 * Show Jabber IDs from address book in Start Conversation screen
diff --git a/build.gradle b/build.gradle
index a6c5eeb00..30706cb97 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,8 +65,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 283
-        versionName "2.3.0-alpha"
+        versionCode 284
+        versionName "2.3.0-beta"
         archivesBaseName += "-$versionName"
         applicationId "eu.siacs.conversations"
         resValue "string", "applicationId", applicationId
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index 45bbf213d..000000000
--- a/gradle.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-## Project-wide Gradle settings.
-#
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-#
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# Default value: -Xmx1024m -XX:MaxPermSize=256m
-# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-#
-# When configured, Gradle will run in incubating parallel mode.
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
-org.gradle.jvmargs=-Xmx2048M