From 3860c2f9c487318a5df1c25b59a3f2af8a2bf186 Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 9 Apr 2017 22:39:50 +0200
Subject: [PATCH] update changelog, bump versions

---
 CHANGELOG.md                              | 3 ++-
 app/build.gradle                          | 4 ++--
 app/src/main/res/xml/changelog_master.xml | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 730debff7..d43013c77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,13 @@
 ###Changelog
 
-###Version next
+###Version 0.18.5
 * Applied some material design guidelines to Charts and (pebble) app management
 * Changed colours: deep sleep is now dark blue, light sleep is now light blue
 * Support for exporting and importing of preferences in addition to the database
 * Visual improvements of the pie charts
 * Add filter by name in the App blacklist activity
 * Pebble: improve compatibility with watch app configuration pages
+* Pebble: display battery percentage (will only update once an hour)
 * HPlus: users can now decide whether they want to pair the device or not, hopefully fixing some connection problems (#642)
 * HPlus: display battery state and warn on low battery
 
diff --git a/app/build.gradle b/app/build.gradle
index 44f50e4ee..ce8ef8abf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,8 +26,8 @@ android {
         targetSdkVersion 25
 
         // note: always bump BOTH versionCode and versionName!
-        versionName "0.18.4"
-        versionCode 91
+        versionName "0.18.5"
+        versionCode 92
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 2365e27e8..bea25db6d 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
-    <release version="next">
+    <release version="0.18.5" versioncode="92">
         <change>Applied some material design guidelines to Charts and (pebble) app management</change>
         <change>Changed colours: deep sleep is now dark blue, light sleep is now light blue</change>
         <change>Support for exporting and importing of preferences in addition to the database</change>
         <change>Visual improvements of the pie charts</change>
         <change>Add filter by name in the App blacklist activity</change>
         <change>Pebble: improve compatibility with watch app configuration pages</change>
+        <change>Pebble: display battery percentage (will only update once an hour)</change>
         <change>HPlus: users can now decide whether they want to pair the device or not, hopefully fixing some connection problems (#642)</change>
         <change>HPlus: display battery state and warn on low battery</change>
     </release>