aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.rst12
-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, 20 insertions, 8 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 68292d3..80aaa09 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,15 @@
+Changes in `3.1.4 <https://gitlab.matrix.org/matrix-org/olm/tags/3.1.4>`_
+=========================================================================
+
+This release includes the following changes since 3.1.4:
+
+* Build improvements:
+ * Install headers in the system-configured include directory with CMake.
+ * Overwrite symbolic links when installing with make.
+ * Improve compatibility with more emscripten versions.
+* Don't use hypothesis in Python unit tests.
+* Some documentation improvements.
+
Changes in `3.1.3 <https://gitlab.matrix.org/matrix-org/olm/tags/3.1.3>`_
=========================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da5baee..c87f7b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.4)
-project(olm VERSION 3.1.3 LANGUAGES CXX C)
+project(olm VERSION 3.1.4 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 a0c48e3..2e06c31 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# The libolm version
MAJOR = 3
MINOR = 1
- PATCH = 3
+ PATCH = 4
s.name = "OLMKit"
s.version = "#{MAJOR}.#{MINOR}.#{PATCH}"
diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index 354f93b..209fb84 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -8,9 +8,9 @@ android {
defaultConfig {
minSdkVersion 11
targetSdkVersion 28
- versionCode 313
- versionName "3.1.3"
- version "3.1.3"
+ versionCode 314
+ versionName "3.1.4"
+ version "3.1.4"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/common.mk b/common.mk
index ca750b6..aa43768 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
MAJOR := 3
MINOR := 1
-PATCH := 3
+PATCH := 4
diff --git a/javascript/package.json b/javascript/package.json
index bfd2053..d68020a 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
{
"name": "olm",
- "version": "3.1.3",
+ "version": "3.1.4",
"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 b70cb89..9ae5077 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.3"
+__version__ = "3.1.4"
__author__ = "Damir Jelić"
__author_email__ = "poljar@termina.org.uk"
__license__ = "Apache 2.0"