aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--OLMKit.podspec4
-rw-r--r--README.rst5
-rw-r--r--android/olm-sdk/build.gradle6
-rw-r--r--javascript/package.json2
5 files changed, 10 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 438fa68..7b43cbc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
MAJOR := 2
-MINOR := 1
+MINOR := 2
PATCH := 0
VERSION := $(MAJOR).$(MINOR).$(PATCH)
PREFIX ?= /usr/local
diff --git a/OLMKit.podspec b/OLMKit.podspec
index f843f93..9513b09 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -2,8 +2,8 @@ Pod::Spec.new do |s|
# The libolm version
MAJOR = 2
- MINOR = 1
- PATCH = 0
+ MINOR = 2
+ Patch = 0
s.name = "OLMKit"
s.version = "#{MAJOR}.#{MINOR}.#{PATCH}"
diff --git a/README.rst b/README.rst
index bc5e21c..82359c6 100644
--- a/README.rst
+++ b/README.rst
@@ -49,8 +49,9 @@ To build the Xcode workspace for Objective-C bindings, run:
Release process
---------------
-First: bump version numbers in ``Makefile``, ``javascript/package.json``, and
-``OLMKit.podspec``.
+First: bump version numbers in ``Makefile``, ``javascript/package.json``,
+``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
git.
diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index 9ce4d37..e974843 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -9,9 +9,9 @@ android {
defaultConfig {
minSdkVersion 11
targetSdkVersion 21
- versionCode 1
- versionName "1.0"
- version "0.2.0"
+ versionCode 220
+ versionName "2.2.0"
+ version "2.2.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/javascript/package.json b/javascript/package.json
index 5e8bd2c..08bcabf 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
{
"name": "olm",
- "version": "2.1.0",
+ "version": "2.2.0",
"description": "An implementation of the Double Ratchet cryptographic ratchet",
"main": "olm.js",
"files": [