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
matrix-org
Olm
Commits
150c360e
Commit
150c360e
authored
Jan 18, 2017
by
Richard van der Hoff
Browse files
Bump version numbers to 2.2.0
parent
972798d1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
150c360e
#!/usr/bin/make -f
#!/usr/bin/make -f
MAJOR
:=
2
MAJOR
:=
2
MINOR
:=
1
MINOR
:=
2
PATCH
:=
0
PATCH
:=
0
VERSION
:=
$(MAJOR)
.
$(MINOR)
.
$(PATCH)
VERSION
:=
$(MAJOR)
.
$(MINOR)
.
$(PATCH)
PREFIX
?=
/usr/local
PREFIX
?=
/usr/local
...
...
OLMKit.podspec
View file @
150c360e
...
@@ -2,8 +2,8 @@ Pod::Spec.new do |s|
...
@@ -2,8 +2,8 @@ Pod::Spec.new do |s|
# The libolm version
# The libolm version
MAJOR
=
2
MAJOR
=
2
MINOR
=
1
MINOR
=
2
P
ATCH
=
0
P
atch
=
0
s
.
name
=
"OLMKit"
s
.
name
=
"OLMKit"
s
.
version
=
"
#{
MAJOR
}
.
#{
MINOR
}
.
#{
PATCH
}
"
s
.
version
=
"
#{
MAJOR
}
.
#{
MINOR
}
.
#{
PATCH
}
"
...
...
README.rst
View file @
150c360e
...
@@ -49,8 +49,9 @@ To build the Xcode workspace for Objective-C bindings, run:
...
@@ -49,8 +49,9 @@ To build the Xcode workspace for Objective-C bindings, run:
Release process
Release process
---------------
---------------
First: bump version numbers in ``Makefile``, ``javascript/package.json``, and
First: bump version numbers in ``Makefile``, ``javascript/package.json``,
``OLMKit.podspec``.
``OLMKit.podspec``, and ``android/olm-sdk/build.gradle`` (``versionCode``,
``versionName`` and ``version``).
Also, ensure the changelog is up to date, and that everyting is committed to
Also, ensure the changelog is up to date, and that everyting is committed to
git.
git.
...
...
android/olm-sdk/build.gradle
View file @
150c360e
...
@@ -9,9 +9,9 @@ android {
...
@@ -9,9 +9,9 @@ android {
defaultConfig
{
defaultConfig
{
minSdkVersion
11
minSdkVersion
11
targetSdkVersion
21
targetSdkVersion
21
versionCode
1
versionCode
220
versionName
"
1
.0"
versionName
"
2.2
.0"
version
"
0
.2.0"
version
"
2
.2.0"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
}
}
buildTypes
{
buildTypes
{
...
...
javascript/package.json
View file @
150c360e
{
{
"name"
:
"olm"
,
"name"
:
"olm"
,
"version"
:
"2.
1
.0"
,
"version"
:
"2.
2
.0"
,
"description"
:
"An implementation of the Double Ratchet cryptographic ratchet"
,
"description"
:
"An implementation of the Double Ratchet cryptographic ratchet"
,
"main"
:
"olm.js"
,
"main"
:
"olm.js"
,
"files"
:
[
"files"
:
[
...
...
Write
Preview
Supports
Markdown
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