Merge pull request #865 from redsolution/develop

Update to 568

Author: Str4tocaster

.travis.yml

@@ -30,7 +30,7 @@ install:
 
 script:
   # By default Travis-ci executes './gradlew build connectedCheck' if no 'script:' section found.
-  - ./gradlew clean build -Pbuild=dev
+  - ./gradlew clean build -Pbuild=open
 
 
 env:

README.md

@@ -18,7 +18,7 @@ Xabber uses Gradle build system. The only specific thing is git submodule for ge
 
 **2. Build**
 
-To build Xabber use **"dev"** productFlavour. Other flavours like "beta", "prod", "ru" and "vip" requare api keys that not represent in this repository.
+To build Xabber use **"open"** productFlavour. Other flavours like "beta", "prod", "dev" and "vip" requare api keys that not represent in this repository.
 
 ## Translations [![Crowdin](https://d322cqt584bo4o.cloudfront.net/xabber/localized.svg)](https://crowdin.com/project/xabber)
 

xabber/build.gradle

@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 28
-        versionCode 533
-        versionName '2.5(533)'
+        versionCode 568
+        versionName '2.6(568)'
     }
 
     lintOptions {
@@ -38,6 +38,13 @@ android {
     flavorDimensions "build"
     productFlavors {
 
+        open {
+            dimension "build"
+            applicationId "com.xabber.android.open"
+            resValue 'string', 'application_package', applicationId
+            multiDexEnabled true
+        }
+
         dev {
             dimension "build"
             applicationId "com.xabber.androiddev"
@@ -65,28 +72,13 @@ android {
             resValue 'string', 'application_package', applicationId
             multiDexEnabled true
         }
-
-        ru {
-            dimension "build"
-            applicationId "com.xabber.android.ru"
-            resValue 'string', 'application_package', applicationId
-            multiDexEnabled true
-        }
-
     }
 
     buildTypes {
         release {
             minifyEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),
-                    'proguard-rules.pro'
-            // enable crashlytics
-            buildConfigField "boolean", "USE_CRASHLYTICS", "true"
-        }
-        debug {
-            // disable crashlytics
-            buildConfigField "boolean", "USE_CRASHLYTICS", "false"
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -103,33 +95,14 @@ android {
             universalApk true
         }
     }
-
-    afterEvaluate {
-        initFabricPropertiesIfNeeded()
-    }
-}
-
-def initFabricPropertiesIfNeeded() {
-    def propertiesFile = file('fabric.properties')
-
-    def apiSecret = hasProperty('crashlyticsApisecret') ? crashlyticsApisecret : System.getenv('crashlyticsApisecret')
-    def apiKey = hasProperty('crashlyticsApikey') ? crashlyticsApikey : System.getenv('crashlyticsApikey')
-
-    if (!propertiesFile.exists()) {
-        def commentMessage = "This is autogenerated fabric property from system environment to prevent key to be committed to source control."
-        ant.propertyfile(file: "fabric.properties", comment: commentMessage) {
-            entry(key: "apiSecret", value: apiSecret)
-            entry(key: "apiKey", value: apiKey)
-        }
-    }
 }
 
 def build_param = "${build}";
 
-if (build_param == "dev") {
-    //exclude all but dev
+if (build_param == "open") {
+    // exclude all flavours except open
     android.variantFilter { variant ->
-        if (!variant.getFlavors().get(0).name.equals('dev')) {
+        if (!variant.getFlavors().get(0).name.equals('open')) {
             variant.setIgnore(true);
         }
     }
@@ -172,7 +145,7 @@ dependencies {
 
     // social
     implementation 'com.google.android.gms:play-services-safetynet:11.4.0'
-    implementation 'com.facebook.android:facebook-android-sdk:4.31.0'
+    implementation 'com.facebook.android:facebook-login:4.36.1'
     implementation 'com.twitter.sdk.android:twitter:3.0.0'
     implementation 'com.google.android.gms:play-services-auth:11.4.0'
     implementation ('com.google.api-client:google-api-client-android:1.22.0') {

xabber/proguard-rules.pro

@@ -35,6 +35,9 @@
 -keep @io.realm.internal.Keep class * { *; }
 -dontwarn javax.**
 -dontwarn io.realm.**
+-keepnames public class * extends io.realm.RealmObject
+-keep public class * extends io.realm.RealmObject { *; }
+-keep class io.realm.** { *; }
 
 # EbentBus
 -keepattributes *Annotation*