OLMKit: Add it to olm from version 2.0.1
This commit is contained in:
parent
7ee17a2957
commit
0b1ecbff2d
4 changed files with 25 additions and 2 deletions
|
@ -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
Makefile
2
Makefile
|
@ -2,7 +2,7 @@
|
|||
|
||||
MAJOR := 2
|
||||
MINOR := 0
|
||||
PATCH := 0
|
||||
PATCH := 1
|
||||
VERSION := $(MAJOR).$(MINOR).$(PATCH)
|
||||
PREFIX ?= /usr/local
|
||||
BUILD_DIR := build
|
||||
|
|
|
@ -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}"
|
||||
|
|
16
README.rst
16
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.
|
||||
|
||||
|
|
Loading…
Reference in a new issue