Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
Olm
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nheko Reborn
Olm
Commits
0b1ecbff
Commit
0b1ecbff
authored
8 years ago
by
manuroe
Browse files
Options
Downloads
Patches
Plain Diff
OLMKit: Add it to olm from version 2.0.1
parent
7ee17a29
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGELOG.rst
+7
-0
7 additions, 0 deletions
CHANGELOG.rst
Makefile
+1
-1
1 addition, 1 deletion
Makefile
OLMKit.podspec
+1
-1
1 addition, 1 deletion
OLMKit.podspec
README.rst
+16
-0
16 additions, 0 deletions
README.rst
with
25 additions
and
2 deletions
CHANGELOG.rst
+
7
−
0
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>`_
===============================================================
...
...
This diff is collapsed.
Click to expand it.
Makefile
+
1
−
1
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
...
...
This diff is collapsed.
Click to expand it.
OLMKit.podspec
+
1
−
1
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
}
"
...
...
This diff is collapsed.
Click to expand it.
README.rst
+
16
−
0
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.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment