Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Michael Telatynski
Olm
Commits
0b1ecbff
Commit
0b1ecbff
authored
Nov 17, 2016
by
manuroe
Browse files
OLMKit: Add it to olm from version 2.0.1
parent
7ee17a29
Changes
4
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.rst
View file @
0b1ecbff
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>`_
===============================================================
...
...
Makefile
View file @
0b1ecbff
...
...
@@ -2,7 +2,7 @@
MAJOR
:=
2
MINOR
:=
0
PATCH
:=
0
PATCH
:=
1
VERSION
:=
$(MAJOR)
.
$(MINOR)
.
$(PATCH)
PREFIX
?=
/usr/local
BUILD_DIR
:=
build
...
...
OLMKit.podspec
View file @
0b1ecbff
...
...
@@ -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
}
"
...
...
README.rst
View file @
0b1ecbff
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment