From 92769cec711c604a1f682b95d6944578d2a1bb3d Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubertc@matrix.org>
Date: Mon, 30 May 2022 13:55:34 -0400
Subject: [PATCH] release 3.2.12

---
 CHANGELOG.rst             | 11 +++++++++++
 CMakeLists.txt            |  2 +-
 OLMKit.podspec            |  2 +-
 Package.swift             |  2 +-
 android/gradle.properties |  2 +-
 common.mk                 |  2 +-
 javascript/package.json   |  2 +-
 python/olm/__version__.py |  2 +-
 8 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 26218d0..19717f4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,14 @@
+Changes in `3.2.12 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.12>`_
+===========================================================================
+
+This release includes the following changes since 3.2.11:
+
+* Expose olm_sas_calculate_mac_fixed_base64 in the bindings.
+* Allow memory to grow in wasm.  Thanks to benkuly for the suggestion.
+* Fix Python type hints.
+* Some Python build fixes.
+* Initial work on a Nix flake for building and testing.
+
 Changes in `3.2.11 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.11>`_
 ===========================================================================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a4f521..871aac9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.4)
 
-project(olm VERSION 3.2.11 LANGUAGES CXX C)
+project(olm VERSION 3.2.12 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 7fcbce6..8a59cd0 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
   # The libolm version
   MAJOR = 3
   MINOR = 2
-  PATCH = 11
+  PATCH = 12
 
   s.name         = "OLMKit"
   s.version      = "#{MAJOR}.#{MINOR}.#{PATCH}"
diff --git a/Package.swift b/Package.swift
index 2a7f694..6e50b2f 100644
--- a/Package.swift
+++ b/Package.swift
@@ -2,7 +2,7 @@
 
 import PackageDescription
 
-let major = 3, minor = 2, patch = 11
+let major = 3, minor = 2, patch = 12
 
 let package = Package(
     name: "Olm",
diff --git a/android/gradle.properties b/android/gradle.properties
index 793e204..30a29f7 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -26,7 +26,7 @@ org.gradle.configureondemand=false
 # Ref: https://github.com/vanniktech/gradle-maven-publish-plugin
 GROUP=org.matrix.android
 POM_ARTIFACT_ID=olm
-VERSION_NAME=3.2.11
+VERSION_NAME=3.2.12
 
 POM_PACKAGING=aar
 
diff --git a/common.mk b/common.mk
index 460b9fc..b6faf0c 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
 
 MAJOR := 3
 MINOR := 2
-PATCH := 11
+PATCH := 12
diff --git a/javascript/package.json b/javascript/package.json
index 5a28463..3ea3e9d 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@matrix-org/olm",
-  "version": "3.2.11",
+  "version": "3.2.12",
   "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 16cb6ad..95d2b82 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.11"
+__version__ = "3.2.12"
 __author__ = "Damir Jelić"
 __author_email__ = "poljar@termina.org.uk"
 __license__ = "Apache 2.0"