From 2140a9bc3e9ead083d3aa18f6fb49dbb4dc8e8d8 Mon Sep 17 00:00:00 2001
From: casey langen <casey.langen@gmail.com>
Date: Sun, 28 May 2017 23:27:49 -0700
Subject: [PATCH] Version bump and CHANGELOG.txt to prep for release

---
 CHANGELOG.txt                   |  16 ++++++++++++++++
 CMakeLists.txt                  |   2 +-
 src/musikbox/app/util/Version.h |   2 +-
 src/musikbox/musikbox.rc        | Bin 5096 -> 5096 bytes
 src/musikdroid/app/build.gradle |   4 ++--
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index d3594604e..75978091f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,19 @@
+0.15.0
+
+user-facing:
+* added `server settings` configuration panel to the settings screen
+* added `minimize to tray` and `start minimized` options to the windows build
+* a handful of small `musikdroid` bug fixes, mostly related to audio focus
+  and ducking.
+
+low-level:
+* added authentication support to the the `websocket_remote` audio server
+* found and fixed a handful of missing `websocket_remote` metadata responses
+* added the ability to hot-reload plugins
+* modified `IPlugin` -- every plugin must now supply a unique `guid`
+
+--------------------------------------------------------------------------------
+
 0.14.0
 
 user-facing:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b6eb1bd4..df8e61111 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.0)
 
 project(musikbox)
 set (musikbox_VERSION_MAJOR 0)
-set (musikbox_VERSION_MINOR 14)
+set (musikbox_VERSION_MINOR 15)
 set (musikbox_VERSION_PATCH 0)
 set (musikbox_VERSION "${musikbox_VERSION_MAJOR}.${musikbox_VERSION_MINOR}.${musikbox_VERSION_PATCH}")
 
diff --git a/src/musikbox/app/util/Version.h b/src/musikbox/app/util/Version.h
index 410127156..8cca1fc25 100644
--- a/src/musikbox/app/util/Version.h
+++ b/src/musikbox/app/util/Version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION "0.14.0"
+#define VERSION "0.15.0"
diff --git a/src/musikbox/musikbox.rc b/src/musikbox/musikbox.rc
index 13d6aeeffc8cf1c8a5b9d5f5245fc58f877d8f92..e15adda89ce2976aa877954c2c6e9c33f54fa6e1 100644
GIT binary patch
delta 41
vcmaE%{z84jIxa@j$?Lg{8BI4o=DNxRq;~TDWdw@t<dvWNf?sIy3w{;=Qy&k0

delta 41
vcmaE%{z84jIxa?&$?Lg{8BI1n=DNxRq;~TDWdw@t<dvWNf?sIy3w{;=Qo;{<

diff --git a/src/musikdroid/app/build.gradle b/src/musikdroid/app/build.gradle
index 599ac0d1f..2253411f3 100644
--- a/src/musikdroid/app/build.gradle
+++ b/src/musikdroid/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "io.casey.musikcube.remote"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 9
-        versionName "0.7.2"
+        versionCode 10
+        versionName "0.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }