From 3745ea57bbce319ac2f190e02062e45a46d23471 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Mon, 22 Feb 2021 17:06:13 -0500
Subject: [PATCH] bump version number and add changelog

---
 CHANGELOG.rst                | 17 +++++++++++++++++
 CMakeLists.txt               |  2 +-
 OLMKit.podspec               |  2 +-
 android/olm-sdk/build.gradle |  6 +++---
 common.mk                    |  2 +-
 javascript/package.json      |  2 +-
 python/olm/__version__.py    |  2 +-
 7 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 944427a..f20668a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,20 @@
+Changes in `3.2.2 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.2>`_
+=========================================================================
+
+This release includes the following changes since 3.2.1:
+
+* Fixes in the TypeScript definition file.
+* CMake build fixes.  Thanks to Gorgurov Alexey.
+* Change the JavaScript package name to ``@matrix-org/olm``.  Note that
+  this means that packages will need to change their ``require`` or
+  ``import`` statements to use this new name.
+* Include file checksums in the JavaScript package.
+* Fix length calculation in fallback key json.  Thanks to Tobias Furuholm.
+* Add a new function to calculate the correct base64 encoding for SAS.
+  (Currently only available in the C API.)
+* Add the ability to specify a pickle key in the Objective-C binding.
+* Add pkg-config file on Unix-like systems.
+
 Changes in `3.2.1 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.1>`_
 =========================================================================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6202bb8..40aa915 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.4)
 
-project(olm VERSION 3.2.1 LANGUAGES CXX C)
+project(olm VERSION 3.2.2 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 413ada8..4f43503 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
   # The libolm version
   MAJOR = 3
   MINOR = 2
-  PATCH = 1
+  PATCH = 2
 
   s.name         = "OLMKit"
   s.version      = "#{MAJOR}.#{MINOR}.#{PATCH}"
diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index 81faf5a..f0e7a03 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -8,9 +8,9 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 28
-        versionCode 321
-        versionName "3.2.1"
-        version "3.2.1"
+        versionCode 322
+        versionName "3.2.2"
+        version "3.2.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/common.mk b/common.mk
index 1bddbde..c6dacea 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
 
 MAJOR := 3
 MINOR := 2
-PATCH := 1
+PATCH := 2
diff --git a/javascript/package.json b/javascript/package.json
index 31ae706..850b1e0 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@matrix-org/olm",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "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 498f89f..6e5e1e6 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.1"
+__version__ = "3.2.2"
 __author__ = "Damir Jelić"
 __author_email__ = "poljar@termina.org.uk"
 __license__ = "Apache 2.0"