From b46ca50dcc5b3cab407c0622f021c8325bffac00 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 21 Jan 2021 17:35:23 +0100
Subject: [PATCH 1/3] android/AndroidManifest.xml: raise targetSdkVersion to 29

The Google overlords require me to change to 29 or else I can't upload
new releases to Google Play.

 https://developer.android.com/distribute/best-practices/develop/target-sdk
---
 android/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 3b136d0c3..948a3e8ac 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -5,7 +5,7 @@
           android:versionCode="51"
           android:versionName="0.22.1">
 
-  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
+  <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
 
   <uses-feature android:name="android.software.leanback"
                 android:required="false" />

From 5b946e9d954352ab1fa4231b1e8f752cdce75a6b Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 21 Jan 2021 17:33:21 +0100
Subject: [PATCH 2/3] android/AndroidManifest.xml: android release 0.22.4

---
 android/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 948a3e8ac..4ce536332 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="51"
-          android:versionName="0.22.1">
+          android:versionCode="52"
+          android:versionName="0.22.4">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
 

From 234cedd6c6303524070d0e975af55fa72eda924f Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 21 Jan 2021 17:43:15 +0100
Subject: [PATCH 3/3] increment version number to 0.22.5

---
 NEWS                        | 2 ++
 android/AndroidManifest.xml | 4 ++--
 doc/conf.py                 | 2 +-
 meson.build                 | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 14b0c4398..c67ff4e81 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+ver 0.22.5 (not yet released)
+
 ver 0.22.4 (2021/01/21)
 * protocol
   - add command "binarylimit" to allow larger chunk sizes
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 4ce536332..364d571e0 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.musicpd"
           android:installLocation="auto"
-          android:versionCode="52"
-          android:versionName="0.22.4">
+          android:versionCode="53"
+          android:versionName="0.22.5">
 
   <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/>
 
diff --git a/doc/conf.py b/doc/conf.py
index 9b163b6cb..74aeb31ba 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -38,7 +38,7 @@ author = 'Max Kellermann'
 # built documents.
 #
 # The short X.Y version.
-version = '0.22.4'
+version = '0.22.5'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/meson.build b/meson.build
index 313bc5d77..50383d13a 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
   'mpd',
   ['c', 'cpp'],
-  version: '0.22.4',
+  version: '0.22.5',
   meson_version: '>= 0.49.0',
   default_options: [
     'c_std=c11',