From 4d17aa4f05044e8063c75b1592d98f1a92a5e214 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Tue, 6 Oct 2020 15:08:10 -0400
Subject: [PATCH] bump version numbers and update changelog

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

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 062990b..6380172 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,20 @@
+Changes in `3.2.0 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.0>`_
+=========================================================================
+
+This release includes the following changes since 3.1.5:
+
+* Add support for fallback keys (MSC2732).
+* Allow some arguments in the JavaScript bindings to be either Uint8Array or
+  strings.
+* Fixes to the TypeScript definition file.
+* Improvements to the JavaScript group demo. Thanks to Saúl Ibarra Corretgé.
+* Ensure that the other party's public key has been set in SAS module. Thanks
+  to Saúl Ibarra Corretgé.
+* Fix building with newer versions of emscripten, and simplify makefile. Thanks
+  to Lukas Lihotzki.
+* Reduce pollution of the global namespace in the Javascript binding. Thanks to
+  Lukas Lihotzki.
+
 Changes in `3.1.5 <https://gitlab.matrix.org/matrix-org/olm/tags/3.1.5>`_
 =========================================================================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e98e317..6fd9c72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.4)
 
-project(olm VERSION 3.1.5 LANGUAGES CXX C)
+project(olm VERSION 3.2.0 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 2b27650..a4a9c5d 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -2,8 +2,8 @@ Pod::Spec.new do |s|
 
   # The libolm version
   MAJOR = 3
-  MINOR = 1
-  PATCH = 5
+  MINOR = 2
+  PATCH = 0
 
   s.name         = "OLMKit"
   s.version      = "#{MAJOR}.#{MINOR}.#{PATCH}"
diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index dd5e4e8..8793152 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -8,9 +8,9 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 28
-        versionCode 315
-        versionName "3.1.5"
-        version "3.1.5"
+        versionCode 320
+        versionName "3.2.0"
+        version "3.2.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/common.mk b/common.mk
index a37882d..bb17ccd 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
 
 MAJOR := 3
-MINOR := 1
-PATCH := 5
+MINOR := 2
+PATCH := 0
diff --git a/javascript/package.json b/javascript/package.json
index 436e17a..9879c61 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "olm",
-  "version": "3.1.5",
+  "version": "3.2.0",
   "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 f472a89..608f09f 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.1.5"
+__version__ = "3.2.0"
 __author__ = "Damir Jelić"
 __author_email__ = "poljar@termina.org.uk"
 __license__ = "Apache 2.0"