From b185229c2beb01b88b21be322cff750c1342e79a Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 18 Jan 2017 18:16:02 +0000
Subject: [PATCH] Prep v2.2.1

---
 CHANGELOG.rst                | 6 ++++++
 Makefile                     | 2 +-
 OLMKit.podspec               | 2 +-
 android/olm-sdk/build.gradle | 6 +++---
 javascript/package.json      | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fa888bf..dc3bb26 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,9 @@
+Changes in `2.2.1 <http://matrix.org/git/olm/commit/?h=2.2.1>`_
+===============================================================
+
+The only change in this release is a fix to the build scripts for the
+Objective-C wrapper which made it impossible to release the 2.2.0 CocoaPod.
+
 Changes in `2.2.0 <http://matrix.org/git/olm/commit/?h=2.2.0>`_
 ===============================================================
 
diff --git a/Makefile b/Makefile
index 7b43cbc..482a1e9 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 MAJOR := 2
 MINOR := 2
-PATCH := 0
+PATCH := 1
 VERSION := $(MAJOR).$(MINOR).$(PATCH)
 PREFIX ?= /usr/local
 BUILD_DIR := build
diff --git a/OLMKit.podspec b/OLMKit.podspec
index 1a1420b..690fe62 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
   # The libolm version
   MAJOR = 2
   MINOR = 2
-  PATCH = 0
+  PATCH = 1
 
   s.name         = "OLMKit"
   s.version      = "#{MAJOR}.#{MINOR}.#{PATCH}"
diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index e974843..a48a9a2 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -9,9 +9,9 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 21
-        versionCode 220
-        versionName "2.2.0"
-        version "2.2.0"
+        versionCode 221
+        versionName "2.2.1"
+        version "2.2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/javascript/package.json b/javascript/package.json
index 08bcabf..d316a74 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "olm",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "An implementation of the Double Ratchet cryptographic ratchet",
   "main": "olm.js",
   "files": [