Prep v2.2.1

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>`_
 ===============================================================
 

Makefile

@@ -2,7 +2,7 @@
 
 MAJOR := 2
 MINOR := 2
-PATCH := 0
+PATCH := 1
 VERSION := $(MAJOR).$(MINOR).$(PATCH)
 PREFIX ?= /usr/local
 BUILD_DIR := build

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}"

android/olm-sdk/build.gradle

@@ -9,9 +9,9 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 21
-        versionCode 220
+        versionCode 221
-        versionName "2.2.0"
+        versionName "2.2.1"
-        version "2.2.0"
+        version "2.2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

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": [