From 5efd38c990b1238236f4e573fba8835dc400982a Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Mon, 5 Dec 2022 17:58:00 -0500 Subject: [PATCH] release 3.2.14 --- CHANGELOG.rst | 9 +++++++++ CMakeLists.txt | 2 +- OLMKit.podspec | 2 +- Package.swift | 2 +- Windows64.cmake | 4 ++-- android/gradle.properties | 2 +- common.mk | 2 +- javascript/package.json | 2 +- python/olm/__version__.py | 2 +- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 209938f..c5f6ea6 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,12 @@ +Changes in `3.2.14 `_ +=========================================================================== + +This release includes the following changes since 3.2.13: + +* TypeScript type improvements. +* Improvements to Python packaging +* Documentation improvements. + Changes in `3.2.13 `_ =========================================================================== diff --git a/CMakeLists.txt b/CMakeLists.txt index 7993770..b4e28f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.4) -project(olm VERSION 3.2.13 LANGUAGES CXX C) +project(olm VERSION 3.2.14 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 0b8dbb0..72e629d 100644 --- a/OLMKit.podspec +++ b/OLMKit.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| # The libolm version MAJOR = 3 MINOR = 2 - PATCH = 13 + PATCH = 14 s.name = "OLMKit" s.version = "#{MAJOR}.#{MINOR}.#{PATCH}" diff --git a/Package.swift b/Package.swift index 459b087..0b36582 100644 --- a/Package.swift +++ b/Package.swift @@ -2,7 +2,7 @@ import PackageDescription -let major = 3, minor = 2, patch = 13 +let major = 3, minor = 2, patch = 14 let package = Package( name: "Olm", diff --git a/Windows64.cmake b/Windows64.cmake index 911c603..6995e4a 100644 --- a/Windows64.cmake +++ b/Windows64.cmake @@ -11,8 +11,8 @@ SET(CMAKE_SYSTEM_NAME Windows) # which compilers to use for C and C++ -SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) -SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) +SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc-posix) +SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++-posix) SET(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres) # here is the target environment located diff --git a/android/gradle.properties b/android/gradle.properties index 9525d1f..67722b2 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.13 +VERSION_NAME=3.2.14 POM_PACKAGING=aar diff --git a/common.mk b/common.mk index a0dc6f6..a352086 100644 --- a/common.mk +++ b/common.mk @@ -1,4 +1,4 @@ MAJOR := 3 MINOR := 2 -PATCH := 13 +PATCH := 14 diff --git a/javascript/package.json b/javascript/package.json index 6341ee8..346c46c 100644 --- a/javascript/package.json +++ b/javascript/package.json @@ -1,6 +1,6 @@ { "name": "@matrix-org/olm", - "version": "3.2.13", + "version": "3.2.14", "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 8f6e869..631cadd 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.13" +__version__ = "3.2.14" __author__ = "Damir Jelić" __author_email__ = "poljar@termina.org.uk" __license__ = "Apache 2.0"