From 0b1ecbff2d31b94046834358b851c369ad36ee88 Mon Sep 17 00:00:00 2001
From: manuroe <manu@matrix.org>
Date: Thu, 17 Nov 2016 14:03:15 +0100
Subject: [PATCH] OLMKit: Add it to olm from version 2.0.1
---
CHANGELOG.rst | 7 +++++++
Makefile | 2 +-
OLMKit.podspec | 2 +-
README.rst | 16 ++++++++++++++++
4 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index a35eedf..47b1547 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,10 @@
+Changes in `2.0.1 <http://matrix.org/git/olm/commit/?h=2.0.1>`_
+===============================================================
+
+This release includes the following changes since 2.0.0
+
+* Add OLMKit, the Objective-C wrapper.
+
Changes in `2.0.0 <http://matrix.org/git/olm/commit/?h=2.0.0>`_
===============================================================
diff --git a/Makefile b/Makefile
index 77aa485..d511ddb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
MAJOR := 2
MINOR := 0
-PATCH := 0
+PATCH := 1
VERSION := $(MAJOR).$(MINOR).$(PATCH)
PREFIX ?= /usr/local
BUILD_DIR := build
diff --git a/OLMKit.podspec b/OLMKit.podspec
index 0877e3a..6403fdc 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# The libolm version
MAJOR = 2
MINOR = 0
- PATCH = 0
+ PATCH = 1
s.name = "OLMKit"
s.version = "#{MAJOR}.#{MINOR}.#{PATCH}"
diff --git a/README.rst b/README.rst
index be1fb1a..9b14efe 100644
--- a/README.rst
+++ b/README.rst
@@ -33,6 +33,14 @@ To build the javascript bindings, install emscripten from http://kripken.github.
make js
+To build the Xcode workspace for Objective-C bindings, run:
+
+.. code:: bash
+
+ cd xcode
+ pod install
+ open OLMKit.xcworkspace
+
Release process
---------------
@@ -50,6 +58,14 @@ Release process
git tag $VERSION -s
git push --tags
+ # OLMKit CocoaPod release
+ # Make sure the version OLMKit.podspec is the same as the git tag
+ # (this should be checked before git tagging)
+ pod spec lint OLMKit.podspec --use-libraries --allow-warnings
+ pod trunk push OLMKit.podspec --use-libraries --allow-warnings
+ # Check the pod has been successully published with:
+ pod search OLMKit
+
It's probably sensible to do the above on a release branch (``release-vx.y.z``
by convention), and merge back to master once complete.
--
GitLab