diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2020-10-06 17:39:48 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2020-10-06 17:39:48 -0400 |
| commit | c4d737c86c9be46a47e91f6b6f27ea2d1b8ed9cf (patch) | |
| tree | 13cf4fff87c957d165ba6830cbfe20d64c12d08b | |
| parent | 60d451bbbe21db90521fc1e5d0731a542c6434c8 (diff) | |
bump version numbers and update changelog3.2.1
| -rw-r--r-- | CHANGELOG.rst | 7 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | OLMKit.podspec | 2 | ||||
| -rw-r--r-- | android/olm-sdk/build.gradle | 6 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | javascript/package.json | 2 | ||||
| -rw-r--r-- | python/olm/__version__.py | 2 |
7 files changed, 15 insertions, 8 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6380172..b9458ba 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,10 @@ +Changes in `3.2.1 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.1>`_ +========================================================================= + +This release includes the following changes since 3.2.1: + +* Fixes in the TypeScript definition file. + Changes in `3.2.0 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.0>`_ ========================================================================= diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fd9c72..5101631 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.4) -project(olm VERSION 3.2.0 LANGUAGES CXX C) +project(olm VERSION 3.2.1 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 a4a9c5d..413ada8 100644 --- a/OLMKit.podspec +++ b/OLMKit.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| # The libolm version MAJOR = 3 MINOR = 2 - PATCH = 0 + PATCH = 1 s.name = "OLMKit" s.version = "#{MAJOR}.#{MINOR}.#{PATCH}" diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle index 8793152..81faf5a 100644 --- a/android/olm-sdk/build.gradle +++ b/android/olm-sdk/build.gradle @@ -8,9 +8,9 @@ android { defaultConfig { minSdkVersion 11 targetSdkVersion 28 - versionCode 320 - versionName "3.2.0" - version "3.2.0" + versionCode 321 + versionName "3.2.1" + version "3.2.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -1,4 +1,4 @@ MAJOR := 3 MINOR := 2 -PATCH := 0 +PATCH := 1 diff --git a/javascript/package.json b/javascript/package.json index 9879c61..c479a98 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -1,6 +1,6 @@ { "name": "olm", - "version": "3.2.0", + "version": "3.2.1", "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 608f09f..498f89f 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.2.0" +__version__ = "3.2.1" __author__ = "Damir Jelić" __author_email__ = "poljar@termina.org.uk" __license__ = "Apache 2.0" |