From 8656f1463c4e16366335fb468453a9455a366c78 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Thu, 16 Sep 2021 17:16:56 -0400 Subject: [PATCH] release 3.2.6 --- CHANGELOG.rst | 8 ++++++++ CMakeLists.txt | 2 +- OLMKit.podspec | 2 +- Package.swift | 2 +- .../olm-sdk/src/main/java/org/matrix/olm/OlmManager.java | 2 +- common.mk | 2 +- javascript/package.json | 2 +- python/olm/__version__.py | 2 +- 8 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 61bc36a..1ebe034 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,11 @@ +Changes in `3.2.6 `_ +========================================================================= + +This release includes the following changes since 3.2.5: + +* Fix building on various platforms when using CMake. Building from the + Makefile still assumes that it is using gcc. + Changes in `3.2.5 `_ ========================================================================= diff --git a/CMakeLists.txt b/CMakeLists.txt index 053fb9b..c1fe2e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.4) -project(olm VERSION 3.2.5 LANGUAGES CXX C) +project(olm VERSION 3.2.6 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 39431a9..775542a 100644 --- a/OLMKit.podspec +++ b/OLMKit.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| # The libolm version MAJOR = 3 MINOR = 2 - PATCH = 5 + PATCH = 6 s.name = "OLMKit" s.version = "#{MAJOR}.#{MINOR}.#{PATCH}" diff --git a/Package.swift b/Package.swift index f85a8df..1d37e76 100644 --- a/Package.swift +++ b/Package.swift @@ -2,7 +2,7 @@ import PackageDescription -let major = 3, minor = 2, patch = 5 +let major = 3, minor = 2, patch = 6 let package = Package( name: "Olm", diff --git a/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java index b9ab802..42ff873 100644 --- a/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java +++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java @@ -46,7 +46,7 @@ public class OlmManager { * @return the library version */ public String getVersion() { - return "3.2.5"; + return "3.2.6"; } /** diff --git a/common.mk b/common.mk index d6848ef..cc0e7f0 100644 --- a/common.mk +++ b/common.mk @@ -1,4 +1,4 @@ MAJOR := 3 MINOR := 2 -PATCH := 5 +PATCH := 6 diff --git a/javascript/package.json b/javascript/package.json index 3a7dc9c..9b8852e 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -1,6 +1,6 @@ { "name": "@matrix-org/olm", - "version": "3.2.5", + "version": "3.2.6", "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 c135e97..0ab4b2e 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.5" +__version__ = "3.2.6" __author__ = "Damir Jelić" __author_email__ = "poljar@termina.org.uk" __license__ = "Apache 2.0"