Merge pull request #654 from QuickBlox/development

update version to 3.9.0
QuickBlox · Dec 17, 2018 · 6c54a65 · 6c54a65
2 parents 8f0f30d + 56a9554
commit 6c54a65
Show file tree

Hide file tree

Showing 497 changed files with 4,260 additions and 1,763 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,4 +37,7 @@ build
 *.swp
 
 # Mac
-.DS_Store
+.DS_Store
+
+# Fabric
+*/fabric.properties
diff --git a/build.gradle b/build.gradle
@@ -1,63 +1,64 @@
 buildscript {
     repositories {
-        jcenter()
         google()
+        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.google.gms:google-services:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.google.gms:google-services:4.1.0'
     }
 }
 
 allprojects {
     repositories {
+        google()
         jcenter()
         maven {
             url "https://github.com/QuickBlox/quickblox-android-sdk-releases/raw/master/"
         }
-        maven {
-            url 'https://maven.google.com'
-        }
     }
 }
 
 ext {
-    compileSdkVersion = 26
-    buildToolsVersion = "27.0.3"
+    compileSdkVersion = 28
+    buildToolsVersion = "28.0.3"
 
     minSdkVersion = 14
-    targetSdkVersion = 26
+    targetSdkVersion = 28
 
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 
     lintAbortOnError = false
 
     // QuickBlox SDK version
     qbChatAdapterVersion = '2.0'
-    qbSdkVersion = '3.8.1'
+    qbSdkVersion = '3.9.0'
 
     versionCode = 381
-    versionName = '3.8.1'
+    versionName = '3.9.0'
 
-    testRunnerVersion = "0.4.1"
+    testRunnerVersion = "1.0.2"
 
     // Dependency versions
-    playServicesVersion = '11.4.2'
-    supportLibVersion = '26.1.0'
-    supportV4Version = supportLibVersion
-    appcompatV7Version = supportLibVersion
-    recyclerviewV7Version = supportLibVersion
-    supportAnnotationsVersion = supportLibVersion
-    designVersion = supportLibVersion
-    cardViewVersion = supportLibVersion
+    playServicesVersion = '16.0.0'
+
+    constraintLayoutAndroidXVersion = '1.1.3'
+    viewPagerAndroidXVersion = '1.0.0'
+    fragmentAndroidXVersion = '1.0.0'
+    lifecycleViewmodelAndroidXVersion = '1.0.0'
+    coreKtxVersion = '1.0.0'
+
+    rxAndroidVersion = '1.2.1'
+    materialVersion = '1.0.0'
 
     glideVersion = '3.6.1'
     pullToRefreshVersion = '3.2.3'
     robotoTextViewVersion = '4.0.0'
-    crashlyticsVersion = '2.8.0'
-    fabricToolsVersion = '1.25.1'
+    crashlyticsVersion = '2.9.5'
+    fabricToolsVersion = '1.25.4'
+    kotlinGradlePlugin = '1.2.71'
     stickylistheadersVersion = '0.4.2'
     swipyVersion = '1.2.3'
 

diff --git a/gradle.properties b/gradle.properties
@@ -17,4 +17,6 @@ org.gradle.daemon=true
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
-org.gradle.configureondemand=true
+org.gradle.configureondemand=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 26 17:44:23 EEST 2017
+#Tue Oct 30 17:08:05 EET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
diff --git a/sample-chat/build.gradle b/sample-chat/build.gradle
@@ -8,13 +8,11 @@ buildscript {
     }
 }
 
-
 apply plugin: 'com.android.application'
 apply plugin: 'io.fabric'
 
 repositories {
     maven { url 'https://maven.fabric.io/public' }
-
     flatDir { dirs 'libs' }
 }
 
@@ -68,11 +66,8 @@ android {
     lintOptions {
         abortOnError false
     }
-
-
 }
 
-
 dependencies {
     implementation(project(":sample-core"))
 
@@ -82,7 +77,10 @@ dependencies {
 
     implementation "com.timehop.stickyheadersrecyclerview:library:$rootProject.stickylistheadersVersion@aar"
     implementation "com.github.orangegangsters:swipy:$rootProject.swipyVersion@aar"
+    implementation("com.crashlytics.sdk.android:crashlytics:${rootProject.crashlyticsVersion}@aar") {
+        transitive = true
+    }
 }
 
 apply from: "../artifacts.gradle"
-apply plugin: 'com.google.gms.google-services'
+apply plugin: 'com.google.gms.google-services'
diff --git a/sample-chat/project.properties b/sample-chat/project.properties
@@ -13,4 +13,3 @@
 # Project target.
 target=android-21
 android.library.reference.1=libraries/pull-to-refresh
-android.library.reference.2=../../SDK/android-sdk/extras/android/support/v7/appcompat
diff --git a/sample-chat/src/main/AndroidManifest.xml b/sample-chat/src/main/AndroidManifest.xml
@@ -58,9 +58,10 @@
             android:label="@string/chat_info"
             android:screenOrientation="portrait" />
 
-        <activity android:name=".ui.activity.AttachmentImageActivity"
-            android:theme="@style/AppTheme.Dark"
-            android:screenOrientation="portrait" />
+        <activity
+            android:name=".ui.activity.AttachmentImageActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.Dark" />
 
         <receiver
             android:name="com.google.android.gms.gcm.GcmReceiver"
@@ -90,22 +91,33 @@
             </intent-filter>
         </service>
 
-        <meta-data android:name="com.quickblox.messages.TYPE" android:value="GCM" />
-        <meta-data android:name="com.quickblox.messages.SENDER_ID" android:value="@string/sender_id" />
-        <meta-data android:name="com.quickblox.messages.QB_ENVIRONMENT" android:value="DEVELOPMENT" />
+        <meta-data
+            android:name="com.quickblox.messages.TYPE"
+            android:value="GCM" />
+
+        <meta-data
+            android:name="com.quickblox.messages.SENDER_ID"
+            android:value="@string/sender_id" />
+
+        <meta-data
+            android:name="com.quickblox.messages.QB_ENVIRONMENT"
+            android:value="DEVELOPMENT" />
 
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
 
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
         </provider>
+        <meta-data
+            android:name="io.fabric.ApiKey"
+            android:value="4b96a3f33893a42103eae91d2166d0c517b833d3" />
     </application>
-</manifest>
+</manifest>
diff --git a/sample-chat/src/main/assets/qb_config.json b/sample-chat/src/main/assets/qb_config.json
@@ -3,8 +3,5 @@
   "auth_key": "f4HYBYdeqTZ7KNb",
   "auth_secret": "ZC7dK39bOjVc-Z8",
   "account_key": "C4_z7nuaANnBYmsG_k98",
-  "api_domain": "https://api.quickblox.com",
-  "chat_domain": "chat.quickblox.com",
   "gcm_sender_id": "761750217637"
-}
-
+}
diff --git a/sample-chat/src/main/assets/sample_config.json b/sample-chat/src/main/assets/sample_config.json
@@ -1,13 +1,12 @@
 {
-    "users_tag": "webrtcusers",
-    "users_password": "x6Bt0VDy5",
-    "port": 5223,
-    "socket_timeout": 300,
-    "keep_alive": true,
-    "use_tls": true,
-    "auto_join": false,
-    "auto_mark_delivered": true,
-    "reconnection_allowed": true,
-    "allow_listen_network": true
-}
-
+  "users_tag": "webrtcusers",
+  "users_password": "x6Bt0VDy5",
+  "port": 5223,
+  "socket_timeout": 300,
+  "keep_alive": true,
+  "use_tls": true,
+  "auto_join": false,
+  "auto_mark_delivered": true,
+  "reconnection_allowed": true,
+  "allow_listen_network": true
+}
diff --git a/sample-chat/src/main/java/com/quickblox/sample/chat/App.java b/sample-chat/src/main/java/com/quickblox/sample/chat/App.java
@@ -1,5 +1,6 @@
 package com.quickblox.sample.chat;
 
+import com.crashlytics.android.Crashlytics;
 import com.quickblox.sample.chat.models.SampleConfigs;
 import com.quickblox.sample.chat.utils.Consts;
 import com.quickblox.sample.chat.utils.configs.ConfigUtils;
@@ -8,13 +9,16 @@
 
 import java.io.IOException;
 
+import io.fabric.sdk.android.Fabric;
+
 public class App extends CoreApp {
     private static final String TAG = App.class.getSimpleName();
     private static SampleConfigs sampleConfigs;
 
     @Override
     public void onCreate() {
         super.onCreate();
+        initFabric();
         ActivityLifecycle.init(this);
         initSampleConfigs();
     }
@@ -30,4 +34,10 @@ private void initSampleConfigs() {
     public static SampleConfigs getSampleConfigs() {
         return sampleConfigs;
     }
+
+    private void initFabric() {
+        if (!BuildConfig.DEBUG) {
+            Fabric.with(this, new Crashlytics());
+        }
+    }
 }