diff options
| author | manuroe <manu@matrix.org> | 2016-11-17 14:03:15 +0100 |
|---|---|---|
| committer | manuroe <manu@matrix.org> | 2016-11-17 14:03:15 +0100 |
| commit | 0b1ecbff2d31b94046834358b851c369ad36ee88 (patch) | |
| tree | c117dd408bdcfdffa85c7c22a304acf4bc4d73e4 | |
| parent | 7ee17a295738f0db8cab74cec2343a577f2ade45 (diff) | |
OLMKit: Add it to olm from version 2.0.1
| -rw-r--r-- | CHANGELOG.rst | 7 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | OLMKit.podspec | 2 | ||||
| -rw-r--r-- | 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>`_ =============================================================== @@ -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}" @@ -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. |