prepare for 3.1.0 release

7 files changed, 37 insertions, 10 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 95d1eb2..0ae4d67 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,4 +1,31 @@
-Changes in `3.0.0 <http://matrix.org/git/olm/commit/?h=2.3.0>`_
+Changes in `3.1.0 <http://matrix.org/git/olm/commit/?h=3.1.0>`_
+===============================================================
+
+This release includes the following changes since 3.0.0:
+
+* Add functions to support Short Authentication String key verification.  The
+  new functions are in the ``sas.h`` header file.  The Android, iOS, JavaScript
+  and Python bindings also include corresponding functions.
+* Add functions to perform public key signing.  These are meant for use with
+  cross-signing.  The new functions are ``olm_pk_signing_size``,
+  ``olm_pk_signing``, ``olm_pk_signing_last_error``, ``olm_clear_pk_signing``,
+  ``olm_pk_signing_key_from_seed``, ``olm_pk_signing_seed_length``,
+  ``olm_pk_signing_public_key_length``, ``olm_pk_signature_length``, and
+  ``olm_pk_sign``.  Signatures generated by ``olm_pk_sign`` can be verified
+  using ``olm_ed25519_verify``.  The Android, iOS, JavaScript and Python
+  bindings also include corresponding functions.
+
+JavaScript wrapper:
+
+* Improved compatibility with newer versions of Emscripten, and dropped support
+  for some older versions of Emscripten.
+
+Python wrapper:
+
+* Build fixes.
+* Add bindings for the public key encryption/decryption functions from olm 2.3.0.
+
+Changes in `3.0.0 <http://matrix.org/git/olm/commit/?h=3.0.0>`_
 ===============================================================
 
 This release includes the following changes to 2.3.0:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ed32677..390db27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1)
 
-project(olm VERSION 3.0.0 LANGUAGES CXX C)
+project(olm VERSION 3.1.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 bd404b9..dac7ab6 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
 
   # The libolm version
   MAJOR = 3
-  MINOR = 0
+  MINOR = 1
   PATCH = 0
 
   s.name         = "OLMKit"
diff --git a/android/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index 53925fa..456880b 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -9,9 +9,9 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 21
-        versionCode 300
-        versionName "3.0.0"
-        version "3.0.0"
+        versionCode 310
+        versionName "3.1.0"
+        version "3.1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/common.mk b/common.mk
index 5400ab4..c8f70b2 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
 
 MAJOR := 3
-MINOR := 0
+MINOR := 1
 PATCH := 0
diff --git a/javascript/package.json b/javascript/package.json
index a1eae79..fe45152 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "olm",
-  "version": "3.0.0",
+  "version": "3.1.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 f75231a..1fde285 100644
--- a/python/olm/__version__.py
+++ b/python/olm/__version__.py
@@ -2,8 +2,8 @@ __title__ = "python-olm"
 __description__ = ("python CFFI bindings for the olm "
                    "cryptographic ratchet library")
 __url__ = "https://github.com/poljar/python-olm"
-__version__ = "3.0.0"
+__version__ = "3.1.0"
 __author__ = "Damir Jelić"
 __author_email__ = "poljar@termina.org.uk"
 __license__ = "Apache 2.0"
-__copyright__ = "Copyright 2018 Damir Jelić"
+__copyright__ = "Copyright 2018-2019 Damir Jelić"