aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst5
-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
7 files changed, 13 insertions, 8 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fed32b2..ffdbd1d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,8 @@
+Changes in `3.1.2 <https://gitlab.matrix.org/matrix-org/olm/tags/3.1.2>`_
+=========================================================================
+
+This release updates the Android bindings to use a newer Android SDK version.
+
Changes in `3.1.1 <https://gitlab.matrix.org/matrix-org/olm/tags/3.1.1>`_
=========================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc7da71..0932a00 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.4)
-project(olm VERSION 3.1.1 LANGUAGES CXX C)
+project(olm VERSION 3.1.2 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 1aa2bd3..e16c58f 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# The libolm version
MAJOR = 3
MINOR = 1
- PATCH = 1
+ PATCH = 2
s.name = "OLMKit"
s.version = "#{MAJOR}.#{MINOR}.#{PATCH}"
diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index 9305baa..660ecbc 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -8,9 +8,9 @@ android {
defaultConfig {
minSdkVersion 11
targetSdkVersion 28
- versionCode 311
- versionName "3.1.1"
- version "3.1.1"
+ versionCode 312
+ versionName "3.1.2"
+ version "3.1.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/common.mk b/common.mk
index 3f18fb4..deb18ec 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
MAJOR := 3
MINOR := 1
-PATCH := 1
+PATCH := 2
diff --git a/javascript/package.json b/javascript/package.json
index 8d590e2..f5ddf1e 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
{
"name": "olm",
- "version": "3.1.1",
+ "version": "3.1.2",
"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 e4ec665..3ce140b 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.1"
+__version__ = "3.1.2"
__author__ = "Damir Jelić"
__author_email__ = "poljar@termina.org.uk"
__license__ = "Apache 2.0"