aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2020-06-11 11:47:50 -0400
committerHubert Chathi <hubert@uhoreg.ca>2020-06-11 11:47:50 -0400
commit8a958beb483b41eda34622c778983421baa7b06d (patch)
tree4874ef796125b28b94b5634c9defbe5f36502ad5
parent9349c1b82bda4188f4fda85b1214abf50e994a7f (diff)
bump version info for release3.1.5
-rw-r--r--CMakeLists.txt2
-rw-r--r--OLMKit.podspec2
-rw-r--r--android/olm-sdk/build.gradle6
-rw-r--r--common.mk2
-rw-r--r--javascript/package.json2
-rw-r--r--python/olm/__version__.py2
6 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b831d03..e98e317 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.4)
-project(olm VERSION 3.1.4 LANGUAGES CXX C)
+project(olm VERSION 3.1.5 LANGUAGES CXX C)
option(OLM_TESTS "Build tests" ON)
option(BUILD_SHARED_LIBS "Build as a shared library" ON)
diff --git a/OLMKit.podspec b/OLMKit.podspec
index 2e06c31..2b27650 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# The libolm version
MAJOR = 3
MINOR = 1
- PATCH = 4
+ PATCH = 5
s.name = "OLMKit"
s.version = "#{MAJOR}.#{MINOR}.#{PATCH}"
diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index 209fb84..dd5e4e8 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -8,9 +8,9 @@ android {
defaultConfig {
minSdkVersion 11
targetSdkVersion 28
- versionCode 314
- versionName "3.1.4"
- version "3.1.4"
+ versionCode 315
+ versionName "3.1.5"
+ version "3.1.5"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/common.mk b/common.mk
index aa43768..a37882d 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
MAJOR := 3
MINOR := 1
-PATCH := 4
+PATCH := 5
diff --git a/javascript/package.json b/javascript/package.json
index 5123c8c..436e17a 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
{
"name": "olm",
- "version": "3.1.4",
+ "version": "3.1.5",
"description": "An implementation of the Double Ratchet cryptographic ratchet",
"main": "olm.js",
"files": [
diff --git a/python/olm/__version__.py b/python/olm/__version__.py
index 9ae5077..f472a89 100644
--- a/python/olm/__version__.py
+++ b/python/olm/__version__.py
@@ -2,7 +2,7 @@ __title__ = "python-olm"
__description__ = ("python CFFI bindings for the olm "
"cryptographic ratchet library")
__url__ = "https://github.com/poljar/python-olm"
-__version__ = "3.1.4"
+__version__ = "3.1.5"
__author__ = "Damir Jelić"
__author_email__ = "poljar@termina.org.uk"
__license__ = "Apache 2.0"