diff --git a/CHANGELOG.rst b/CHANGELOG.rst index a35eedf0ff8d3fad36c8a246ec1a00221e249625..47b1547e96526c12153e2583a2a9c8552c1e1db9 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 77aa485f85789ac7f3addcafa2b53ccc651c0422..d511ddbea9935c593a1c4f90b737085da23f082e 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 0877e3af1096e6fd43a99eaeaca1e6896ebab8f4..6403fdc6d2a34d396d5d8af8609f00a726a912e3 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 be1fb1a1270a86a830f30fc67dc79e00a28de9ba..9b14efe46c1de5fb06b836876e7cf429fcd6e2dc 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.