From 22bc1155edaea3e697a06fded722dd5fc49acc8b Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Mon, 24 May 2021 10:29:24 -0400 Subject: [PATCH] prepare for release --- CHANGELOG.rst | 9 +++++++++ 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, 16 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f20668a..48c1b57 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,12 @@ +Changes in `3.2.3 `_ +========================================================================= + +This release includes the following changes since 3.2.2: + +* Add some checks for invalid input and ensure all fields are initialized. +* Include LibreJS license tags. Thanks to Johannes Marbach for the suggestion. +* Support for Swift Package Manager. Thanks to Johannes Marbach. + Changes in `3.2.2 `_ ========================================================================= diff --git a/CMakeLists.txt b/CMakeLists.txt index 40aa915..c3affa6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.4) -project(olm VERSION 3.2.2 LANGUAGES CXX C) +project(olm VERSION 3.2.3 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 4f43503..dcba9de 100644 --- a/OLMKit.podspec +++ b/OLMKit.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| # The libolm version MAJOR = 3 MINOR = 2 - PATCH = 2 + PATCH = 3 s.name = "OLMKit" s.version = "#{MAJOR}.#{MINOR}.#{PATCH}" diff --git a/Package.swift b/Package.swift index 47f78cb..f256844 100644 --- a/Package.swift +++ b/Package.swift @@ -2,7 +2,7 @@ import PackageDescription -let major = 3, minor = 2, patch = 2 +let major = 3, minor = 2, patch = 3 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 c89edda..7198cf4 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.2"; + return "3.2.3"; } /** diff --git a/common.mk b/common.mk index c6dacea..c4d8030 100644 --- a/common.mk +++ b/common.mk @@ -1,4 +1,4 @@ MAJOR := 3 MINOR := 2 -PATCH := 2 +PATCH := 3 diff --git a/javascript/package.json b/javascript/package.json index 850b1e0..3460f24 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -1,6 +1,6 @@ { "name": "@matrix-org/olm", - "version": "3.2.2", + "version": "3.2.3", "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 6e5e1e6..3c0ba5a 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.2" +__version__ = "3.2.3" __author__ = "Damir Jelić" __author_email__ = "poljar@termina.org.uk" __license__ = "Apache 2.0"