Merge branch 'release/1.0.62'

Author: Grigory Fedorov

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:1.5.0'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip

xabber/MemorizingTrustManager

@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 226
-        versionName '1.0.53'
+        versionCode 235
+        versionName '1.0.62'
     }
 
     compileOptions {
@@ -21,6 +21,10 @@ android {
         disable 'MissingTranslation'
     }
 
+    dexOptions {
+        incremental true
+    }
+
     productFlavors {
 
         dev {
@@ -44,35 +48,36 @@ android {
         }
 
     }
-}
 
-repositories {
-    mavenCentral()
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'),
+                    'proguard-rules.pro'
+        }
+    }
 }
 
 ext {
-    smackVersion = '4.1.4'
+    smackVersion = '4.1.5'
 }
 
 dependencies {
-    compile 'com.android.support:design:23.0.1'
-    compile 'com.android.support:appcompat-v7:23.0.1'
-    compile 'com.android.support:support-v13:23.0.1'
-    compile 'com.github.ksoichiro:android-observablescrollview:1.5.0'
+    compile 'com.android.support:design:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:support-v13:23.1.1'
     compile 'de.hdodenhof:circleimageview:1.2.2'
     compile 'com.melnykov:floatingactionbutton:1.2.0'
-    compile 'dnsjava:dnsjava:2.1.7'
     compile 'com.github.bumptech.glide:glide:3.6.1'
     compile 'com.google.zxing:android-integration:3.1.0'
-    compile 'com.jcraft:jzlib:1.0.7'
     compile 'com.loopj.android:android-async-http:1.4.9'
+    compile 'com.soundcloud.android:android-crop:1.0.1@aar'
+    compile 'io.realm:realm-android:0.85.0'
 
     compile "org.igniterealtime.smack:smack-android-extensions:$smackVersion"
     compile "org.igniterealtime.smack:smack-experimental:$smackVersion"
     compile "org.igniterealtime.smack:smack-tcp:$smackVersion"
     compile project('otr4j')
     compile project('MemorizingTrustManager')
     compile project('emojicon')
-
-    compile 'com.soundcloud.android:android-crop:1.0.0@aar'
 }

xabber/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         minSdkVersion 14
@@ -18,5 +18,5 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:23.0.1'
+    compile 'com.android.support:support-v4:23.1.1'
 }

xabber/emojicon/build.gradle

@@ -0,0 +1,9 @@
+
+# realm
+
+-keep class io.realm.annotations.RealmModule
+-keep @io.realm.annotations.RealmModule class *
+-keep class io.realm.internal.Keep
+-keep @io.realm.internal.Keep class *
+-dontwarn javax.**
+-dontwarn io.realm.**