From a8086ceb43a2cba05a6071c8e4a92175c4eba6aa Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Feb 2021 21:07:25 +0100
Subject: [PATCH 1/2] Prepare release 1.0.17

---
 CHANGES.md                                        | 15 ++-------------
 .../android/en-US/changelogs/40100170.txt         |  2 ++
 2 files changed, 4 insertions(+), 13 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/40100170.txt

diff --git a/CHANGES.md b/CHANGES.md
index 3918318b45..ddcf5a41a0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,9 +1,6 @@
-Changes in Element 1.0.17 (2020-XX-XX)
+Changes in Element 1.0.17 (2020-02-09)
 ===================================================
 
-Features ✨:
- -
-
 Improvements 🙌:
  - Create a WidgetItemFactory and use it for better rendering of Jitsi widget change (video conference)
  - Open image from URL Preview (#2705)
@@ -15,19 +12,11 @@ Bugfix 🐛:
  - HTML unescaping for URL preview (#2766)
  - URL preview on reply fallback (#2756)
  - RTL: some arrows should be rotated in RTL (#2757)
-
-Translations 🗣:
- -
-
-SDK API changes ⚠️:
- -
+ - Properly delete objects from Realm DB (#2765)
 
 Build 🧱:
  - Upgrade build tools
 
-Test:
- -
-
 Other changes:
  - Change app name from "Element (Riot.im)" to "Element"
 
diff --git a/fastlane/metadata/android/en-US/changelogs/40100170.txt b/fastlane/metadata/android/en-US/changelogs/40100170.txt
new file mode 100644
index 0000000000..b787c01b05
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/40100170.txt
@@ -0,0 +1,2 @@
+Main changes in this version: Bug fixes!
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.0.17
\ No newline at end of file

From 08b65b57e427780b2c34e011a39d184a9559bffc Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 9 Feb 2021 21:08:46 +0100
Subject: [PATCH 2/2] Version++

---
 CHANGES.md          | 27 +++++++++++++++++++++++++++
 vector/build.gradle |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index ddcf5a41a0..df4728c634 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,30 @@
+Changes in Element 1.0.18 (2020-XX-XX)
+===================================================
+
+Features ✨:
+ -
+
+Improvements 🙌:
+ -
+
+Bugfix 🐛:
+ -
+
+Translations 🗣:
+ -
+
+SDK API changes ⚠️:
+ -
+
+Build 🧱:
+ -
+
+Test:
+ -
+
+Other changes:
+ -
+
 Changes in Element 1.0.17 (2020-02-09)
 ===================================================
 
diff --git a/vector/build.gradle b/vector/build.gradle
index 486e1b0ab8..838d13a0dd 100644
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -13,7 +13,7 @@ kapt {
 // Note: 2 digits max for each value
 ext.versionMajor = 1
 ext.versionMinor = 0
-ext.versionPatch = 17
+ext.versionPatch = 18
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'