Commit 769d013e authored by Hubert Chathi's avatar Hubert Chathi
Browse files

release 3.1.2

parent 69feb86c

CHANGELOG.rst

+5 −0
Original line number Diff line number Diff line 
Changes in `3.1.2 <https://gitlab.matrix.org/matrix-org/olm/tags/3.1.2>`_

=========================================================================



This release updates the Android bindings to use a newer Android SDK version.



Changes in `3.1.1 <https://gitlab.matrix.org/matrix-org/olm/tags/3.1.1>`_

=========================================================================

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 
cmake_minimum_required(VERSION 3.4)



project(olm VERSION 3.1.1 LANGUAGES CXX C)

project(olm VERSION 3.1.2 LANGUAGES CXX C)



option(OLM_TESTS "Build tests" ON)

option(BUILD_SHARED_LIBS "Build as a shared library" ON)

OLMKit.podspec

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Pod::Spec.new do |s| 
  # The libolm version

  MAJOR = 3

  MINOR = 1

  PATCH = 1

  PATCH = 2



  s.name         = "OLMKit"

  s.version      = "#{MAJOR}.#{MINOR}.#{PATCH}"

android/olm-sdk/build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ android { 
    defaultConfig {

        minSdkVersion 11

        targetSdkVersion 28

        versionCode 311

        versionName "3.1.1"

        version "3.1.1"

        versionCode 312

        versionName "3.1.2"

        version "3.1.2"

        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

    }

    buildTypes {

common.mk

+1 −1
Original line number Diff line number Diff line 


MAJOR := 3

MINOR := 1

PATCH := 1
 
PATCH := 2