Merge branch 'release/0.9.3'

CHANGES.rst

@@ -1,3 +1,29 @@
+Changes in Riot 0.9.3 (2019-07-24)
+===================================================
+
+MatrixSdk:
+ - Upgrade MatrixSdk to version 0.9.26.
+ - Changelog: https://github.com/matrix-org/matrix-android-sdk/releases/tag/v0.9.26
+
+Features:
+ -
+
+Improvements:
+ -
+
+Other changes:
+ -
+
+Bugfix:
+ - Crash on older android due to okhttp bumping requirements to Android 5+
+
+Translations:
+ -
+
+Build:
+ - Include native libraries for 64 bits processors.
+
+
 Changes in Riot 0.9.2 (2019-07-18)
 ===================================================
 

build.gradle

@@ -23,16 +23,16 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 90200
-    versionNameProp = "0.9.2"
+    versionCodeProp = 90300
+    versionNameProp = "0.9.3"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }
 
 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 Matrix Android SDK.

vector/build.gradle

@@ -44,16 +44,7 @@ android {
         versionName rootProject.ext.versionNameProp
 
         ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
-
-        packagingOptions {
-            // The project react-native does not provide 64-bit binaries at the
-            // time of this writing. Unfortunately, packaging any 64-bit
-            // binaries into the .apk will crash the app at runtime on 64-bit
-            // platforms.
-            exclude "lib/x86_64/libjingle_peerconnection_so.so"
-            exclude "lib/arm64-v8a/libjingle_peerconnection_so.so"
+            abiFilters "armeabi-v7a", "x86", 'arm64-v8a', 'x86_64'
         }
 
         multiDexEnabled true
@@ -194,7 +185,7 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.4.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
     implementation "com.google.code.gson:gson:$gson_version"
-    implementation 'com.squareup.okhttp3:okhttp:3.11.0'
+    implementation "com.squareup.okhttp3:okhttp:$okhttp_version"
     implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.10.0'
     implementation 'com.squareup.okhttp3:logging-interceptor:3.10.0'
     implementation 'com.facebook.stetho:stetho:1.5.0'
@@ -216,7 +207,7 @@ dependencies {
     /************* Matrix SDK management **************/
     // update settings.gradle
     // use the matrix SDK as external dependency
-    implementation 'com.github.matrix-org:matrix-android-sdk:v0.9.24.3'
+    implementation 'com.github.matrix-org:matrix-android-sdk:v0.9.26'
     // use the matrix SDK as a sub project
     // you have to uncomment some lines in settings.gradle
     //implementation project(':matrix-sdk')
@@ -261,6 +252,15 @@ dependencies {
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
 }
 
+//Ensure we never move past okhttp 3.12.x
+configurations.all {
+    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
+        if (details.requested.group == 'com.squareup.okhttp3' && details.requested.name == 'okhttp') {
+            details.useVersion '3.12.3'
+            details.because '3.13+ dropped support for android <5'
+        }
+    }
+}
 
 if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Appfdroid")
         && !getGradle().getStartParameter().getTaskRequests().toString().contains("assembleAndroidTest")) {