mirrors
/
olm
mirror of https://git.matrix.org/git/olm.git
1
0
Fork 0
Code Issues Releases Wiki Activity

release 3.1.2

matthew/markdown 3.1.2
Hubert Chathi 2019-04-30 18:25:21 -04:00
parent 69feb86c01
commit 769d013ef7
7 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.rst
View File

@ -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>`_ Changes in `3.1.1 <https://gitlab.matrix.org/matrix-org/olm/tags/3.1.1>`_
========================================================================= =========================================================================

2
CMakeLists.txt
View File

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.4) 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(OLM_TESTS "Build tests" ON)
option(BUILD_SHARED_LIBS "Build as a shared library" ON) option(BUILD_SHARED_LIBS "Build as a shared library" ON)

2
OLMKit.podspec
View File

@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# The libolm version # The libolm version
MAJOR = 3 MAJOR = 3
MINOR = 1 MINOR = 1
PATCH = 1 PATCH = 2
s.name = "OLMKit" s.name = "OLMKit"
s.version = "#{MAJOR}.#{MINOR}.#{PATCH}" s.version = "#{MAJOR}.#{MINOR}.#{PATCH}"

6
android/olm-sdk/build.gradle
View File

@ -8,9 +8,9 @@ android {
defaultConfig { defaultConfig {
minSdkVersion 11 minSdkVersion 11
targetSdkVersion 28 targetSdkVersion 28
versionCode 311 versionCode 312
versionName "3.1.1" versionName "3.1.2"
version "3.1.1" version "3.1.2"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
} }
buildTypes { buildTypes {

2
common.mk
View File

@ -1,4 +1,4 @@
MAJOR := 3 MAJOR := 3
MINOR := 1 MINOR := 1
PATCH := 1 PATCH := 2

2
javascript/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "olm", "name": "olm",
"version": "3.1.1", "version": "3.1.2",
"description": "An implementation of the Double Ratchet cryptographic ratchet", "description": "An implementation of the Double Ratchet cryptographic ratchet",
"main": "olm.js", "main": "olm.js",
"files": [ "files": [

2
python/olm/__version__.py
View File

@ -2,7 +2,7 @@ __title__ = "python-olm"
__description__ = ("python CFFI bindings for the olm " __description__ = ("python CFFI bindings for the olm "
"cryptographic ratchet library") "cryptographic ratchet library")
__url__ = "https://github.com/poljar/python-olm" __url__ = "https://github.com/poljar/python-olm"
__version__ = "3.1.1" __version__ = "3.1.2"
__author__ = "Damir Jelić" __author__ = "Damir Jelić"
__author_email__ = "poljar@termina.org.uk" __author_email__ = "poljar@termina.org.uk"
__license__ = "Apache 2.0" __license__ = "Apache 2.0"