From 98e8ee1b0da9609c0b504d9582dfedd14db38c00 Mon Sep 17 00:00:00 2001
From: Hubert Chathi <hubert@uhoreg.ca>
Date: Wed, 4 Jul 2018 15:24:44 -0400
Subject: [PATCH] prepare 2.3.0

---
 CHANGELOG.rst                | 34 ++++++++++++++++++++++++++++++++++
 OLMKit.podspec               |  4 ++--
 android/olm-sdk/build.gradle |  6 +++---
 common.mk                    |  4 ++--
 javascript/package.json      |  2 +-
 5 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 0b4608b..fa1eccb 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,37 @@
+Changes in `2.3.0 <http://matrix.org/git/olm/commit/?h=2.3.0>`_
+
+This release includes the following changes since 2.2.2:
+
+* Support building on Windows. Thanks to Marcel Radzio.
+* Avoid C99 inside C++ code. Thanks to Alexey Rusakov.
+* Support building as a static library. Thanks to Andreas Zwinkau.
+
+New functionality:
+
+* Add a number of methods for public key encryption and decryption. This
+  functionality is meant for use with allowing virus scanning of encrypted
+  attachments, server-side encrypted key backups, and possibly other uses. The
+  methods are listed in the ``olm/pk.h`` header file. Corresponding wrappers
+  are available in the JavaScript and Android wrappers. Objective-C and Python
+  wrappers will be available in a future release.
+
+Android wrapper:
+
+* Update build tool dependencies
+* Apply some hardening flags and fix some compilation and run-time issues.
+  Thanks in part to Arnaud Fontaine.
+
+Objective-C wrapper:
+
+* Update project file
+* Fix compiler warnings
+
+Python wrapper:
+
+* Add binding for ``olm_remove_one_time_keys``. Thanks to Wilfried Klaebe.
+* Add utility module for ``ed25519_verify``. Thanks to Alexander Maznev.
+* Improve portability. Thanks to Jan Jancar.
+
 Changes in `2.2.2 <http://matrix.org/git/olm/commit/?h=2.2.2>`_
 ===============================================================
 
diff --git a/OLMKit.podspec b/OLMKit.podspec
index cf05845..c6abbdc 100644
--- a/OLMKit.podspec
+++ b/OLMKit.podspec
@@ -2,8 +2,8 @@ Pod::Spec.new do |s|
 
   # The libolm version
   MAJOR = 2
-  MINOR = 2
-  PATCH = 2
+  MINOR = 3
+  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 c114968..29d174e 100644
--- a/android/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
@@ -9,9 +9,9 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 21
-        versionCode 222
-        versionName "2.2.2"
-        version "2.2.2"
+        versionCode 230
+        versionName "2.3.0"
+        version "2.3.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/common.mk b/common.mk
index 4f079d2..1302188 100644
--- a/common.mk
+++ b/common.mk
@@ -1,4 +1,4 @@
 
 MAJOR := 2
-MINOR := 2
-PATCH := 2
+MINOR := 3
+PATCH := 0
diff --git a/javascript/package.json b/javascript/package.json
index 6751972..9cae60e 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "olm",
-  "version": "2.2.2",
+  "version": "2.3.0",
   "description": "An implementation of the Double Ratchet cryptographic ratchet",
   "main": "olm.js",
   "files": [