From 77eaaa3d5f60b83a618ee2034e2934bd6889339d Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Wed, 1 Mar 2017 16:21:37 +0000
Subject: [PATCH] prepare v2.2.2

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

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index dc3bb26..0b4608b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,11 @@
+Changes in `2.2.2 <http://matrix.org/git/olm/commit/?h=2.2.2>`_
+===============================================================
+
+Objective-C wrapper:
+
+* Fixed type of ``messageIndex`` argument in
+  ``exportSessionAtMessageIndex``. Thanks to Greg Hughes.
+
 Changes in `2.2.1 <http://matrix.org/git/olm/commit/?h=2.2.1>`_
 ===============================================================
 
diff --git a/Makefile b/Makefile
index 482a1e9..77bf0ec 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 MAJOR := 2
 MINOR := 2
-PATCH := 1
+PATCH := 2
 VERSION := $(MAJOR).$(MINOR).$(PATCH)
 PREFIX ?= /usr/local
 BUILD_DIR := build
diff --git a/OLMKit.podspec b/OLMKit.podspec
index 690fe62..9cac8d0 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
   # The libolm version
   MAJOR = 2
   MINOR = 2
-  PATCH = 1
+  PATCH = 2
 
   s.name         = "OLMKit"
   s.version      = "#{MAJOR}.#{MINOR}.#{PATCH}"
diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index a48a9a2..9601c87 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -9,9 +9,9 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 21
-        versionCode 221
-        versionName "2.2.1"
-        version "2.2.1"
+        versionCode 222
+        versionName "2.2.2"
+        version "2.2.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/javascript/package.json b/javascript/package.json
index d316a74..6751972 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "olm",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "An implementation of the Double Ratchet cryptographic ratchet",
   "main": "olm.js",
   "files": [