Merge branch 'release/0.9.26'

matrix-org · Jul 24, 2019 · 3b808f6 · 3b808f6
2 parents 623c8fe + 3765038
commit 3b808f6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,3 +1,10 @@
+Changes to Matrix Android SDK in 0.9.26 (2019-07-24)
+=======================================================
+
+Build:
+ - Downgrade $okhttp_version in config file
+
+
 Changes to Matrix Android SDK in 0.9.25 (2019-07-24)
 =======================================================
 

diff --git a/build.gradle b/build.gradle
@@ -23,7 +23,7 @@ buildscript {
 allprojects {
     ext.support_lib_version = '28.0.0'
     ext.gson_version = '2.8.5'
-    ext.okhttp_version = '3.14.1'
+    ext.okhttp_version = '3.12.3'
 
     repositories {
         // For olm library. This has to be declared first, to ensure that Olm library is not downloaded from another repo

diff --git a/matrix-sdk/build.gradle b/matrix-sdk/build.gradle
@@ -27,8 +27,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 925
-        versionName "0.9.25"
+        versionCode 926
+        versionName "0.9.26"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         // Enable multi dex for test