Bump version numbers to 2.2.0
This commit is contained in:
parent
972798d1b7
commit
150c360e82
5 changed files with 10 additions and 9 deletions
2
Makefile
2
Makefile
|
@ -1,7 +1,7 @@
|
||||||
#!/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
|
||||||
|
|
|
@ -2,8 +2,8 @@ Pod::Spec.new do |s|
|
||||||
|
|
||||||
# The libolm version
|
# The libolm version
|
||||||
MAJOR = 2
|
MAJOR = 2
|
||||||
MINOR = 1
|
MINOR = 2
|
||||||
PATCH = 0
|
Patch = 0
|
||||||
|
|
||||||
s.name = "OLMKit"
|
s.name = "OLMKit"
|
||||||
s.version = "#{MAJOR}.#{MINOR}.#{PATCH}"
|
s.version = "#{MAJOR}.#{MINOR}.#{PATCH}"
|
||||||
|
|
|
@ -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.
|
||||||
|
|
|
@ -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 {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"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": [
|
||||||
|
|
Loading…
Reference in a new issue