From 58db99cfc7beb680f933cbd9994791861358b6ef Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Sun, 15 Apr 2018 00:32:54 +0200
Subject: [PATCH] Bump version, add changelogs

---
 CHANGELOG.md                                       | 4 ++++
 app/build.gradle                                   | 4 ++--
 app/src/main/res/xml/changelog_master.xml          | 4 ++++
 fastlane/metadata/android/en-US/changelogs/126.txt | 2 ++
 4 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/126.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cd2e5ec2..e98f19382 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ### Changelog
 
+#### Version 0.26.0
+* Amazfit Bip: Initial support for GPS tracks
+* Pebble: Wind speed/direction support and bugfixes for weather when using background javascript
+
 #### Version 0.25.1
 * Amazfit Cor: Try to send weather location instead of AQI
 * Amazfit Bip: Support setting start end end time for background light when lifting the arm
diff --git a/app/build.gradle b/app/build.gradle
index 07f7278d3..1442600b1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -25,8 +25,8 @@ android {
         targetSdkVersion 27
 
         // Note: always bump BOTH versionCode and versionName!
-        versionName "0.25.1"
-        versionCode 125
+        versionName "0.26.0"
+        versionCode 126
         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 c27ccc1a7..d47474aea 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+    <release version="0.26.0" versioncode="126">
+        <change>AAmazfit Bip: Initial support for GPS tracks</change>
+        <change>APebble: Wind speed/direction support and bugfixes for weather when using background javascript</change>
+    </release>
     <release version="0.25.1" versioncode="125">
         <change>Amazfit Cor: Try to send weather location instead of AQI</change>
         <change>Amazfit Bip: Support setting start end end time for background light when lifting the arm</change>
diff --git a/fastlane/metadata/android/en-US/changelogs/126.txt b/fastlane/metadata/android/en-US/changelogs/126.txt
new file mode 100644
index 000000000..a8c3986bf
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/126.txt
@@ -0,0 +1,2 @@
+* Amazfit Bip: Initial support for GPS tracks
+* Pebble: Wind speed/direction support and bugfixes for weather when using background javascript