diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-01-18 18:16:02 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-01-18 18:16:32 +0000 |
| commit | b185229c2beb01b88b21be322cff750c1342e79a (patch) | |
| tree | e6403d6c69672d8c3b99caaeae7f8e4d76f8ad95 | |
| parent | 1014712fd0f759d99fe37e92f35fea4e8b20e722 (diff) | |
Prep v2.2.12.2.1
| -rw-r--r-- | CHANGELOG.rst | 6 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | OLMKit.podspec | 2 | ||||
| -rw-r--r-- | android/olm-sdk/build.gradle | 6 | ||||
| -rw-r--r-- | 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>`_ =============================================================== @@ -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": [ |