diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-01-18 16:01:59 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-01-18 16:03:02 +0000 |
| commit | 150c360e82f0d27cb46a8d69e545b6706be3c8e4 (patch) | |
| tree | 0308c9ac016e10c2860dfc6099c2fb756a98caab | |
| parent | 972798d1b7956f51122cb5c92293c04d1258322e (diff) | |
Bump version numbers to 2.2.02.2.0
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | OLMKit.podspec | 4 | ||||
| -rw-r--r-- | README.rst | 5 | ||||
| -rw-r--r-- | android/olm-sdk/build.gradle | 6 | ||||
| -rw-r--r-- | javascript/package.json | 2 |
5 files changed, 10 insertions, 9 deletions
@@ -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}" @@ -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": [ |