From 7e0c8277032e40308987257b711b38af8d77cc69 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubertc@matrix.org>
Date: Thu, 23 Nov 2023 12:38:51 -0500
Subject: [PATCH] release 3.2.16

---
 CHANGELOG.rst             | 9 ++++++++-
 CMakeLists.txt            | 2 +-
 OLMKit.podspec            | 2 +-
 Package.swift             | 2 +-
 README.md                 | 5 ++---
 android/gradle.properties | 2 +-
 common.mk                 | 2 +-
 javascript/package.json   | 2 +-
 python/pyproject.toml     | 2 +-
 9 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d0c03c3..9671e4d 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,8 +1,15 @@
-Changes in `3.2.15 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.15>`_
+Changes in `3.2.16 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.16>`_
 ===========================================================================
 
 This release includes the following changes since 3.2.15:
 
+* Fix and modernize the Python packaging (thanks to Alfred Wingate)
+
+Changes in `3.2.15 <https://gitlab.matrix.org/matrix-org/olm/tags/3.2.15>`_
+===========================================================================
+
+This release includes the following changes since 3.2.14:
+
 * Improvements to Python packaging
   * No longer depend on ``future`` since Python 2 is no longer supported.
   * Improve compatibility with tox 4.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a271b54..951965f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.4)
 
-project(olm VERSION 3.2.15 LANGUAGES CXX C)
+project(olm VERSION 3.2.16 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 3e4b3f8..58b822b 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
   # The libolm version
   MAJOR = 3
   MINOR = 2
-  PATCH = 15
+  PATCH = 16
 
   s.name         = "OLMKit"
   s.version      = "#{MAJOR}.#{MINOR}.#{PATCH}"
diff --git a/Package.swift b/Package.swift
index 19389f7..c1d56ff 100644
--- a/Package.swift
+++ b/Package.swift
@@ -2,7 +2,7 @@
 
 import PackageDescription
 
-let major = 3, minor = 2, patch = 15
+let major = 3, minor = 2, patch = 16
 
 let package = Package(
     name: "Olm",
diff --git a/README.md b/README.md
index db305e1..ee7fcfe 100644
--- a/README.md
+++ b/README.md
@@ -206,9 +206,8 @@ endorsed by the Matrix.org Foundation C.I.C.
 ## Release process
 
 First: bump version numbers in ``common.mk``, ``CMakeLists.txt``,
-``javascript/package.json``, ``python/olm/__version__.py``,
-``python/pyproject.toml``, ``OLMKit.podspec``, ``Package.swift``, and
-``android/gradle.properties``.
+``javascript/package.json``, ``python/pyproject.toml``, ``OLMKit.podspec``,
+``Package.swift``, and ``android/gradle.properties``.
 
 Also, ensure the changelog is up to date, and that everything is committed to
 git.
diff --git a/android/gradle.properties b/android/gradle.properties
index 6617728..7005ec1 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.15
+VERSION_NAME=3.2.16
 
 POM_PACKAGING=aar
 
diff --git a/common.mk b/common.mk
index ef854dc..bc72805 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
 
 MAJOR := 3
 MINOR := 2
-PATCH := 15
+PATCH := 16
diff --git a/javascript/package.json b/javascript/package.json
index 8b73d93..5e1ddd8 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@matrix-org/olm",
-  "version": "3.2.15",
+  "version": "3.2.16",
   "description": "An implementation of the Double Ratchet cryptographic ratchet",
   "main": "olm.js",
   "files": [
diff --git a/python/pyproject.toml b/python/pyproject.toml
index 1db7b7d..973cbc4 100644
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-olm"
-version = "3.2.15"
+version = "3.2.16"
 description = "python CFFI bindings for the olm cryptographic ratchet library"
 authors = [{name = "Damir Jelić", email = "poljar@termina.org.uk"}]
 license = {text = "Apache-2.0"}