Merge branch 'develop' into new/permission-list

app/build.gradle

@@ -126,7 +126,7 @@ dependencies {
 
     implementation "com.github.luciofm:livedata-ktx:b1e8bbc25a"
 
-    implementation('com.crashlytics.sdk.android:crashlytics:2.9.2@aar') {
+    implementation('com.crashlytics.sdk.android:crashlytics:2.9.4@aar') {
         transitive = true
     }
 

app/gradle/wrapper/gradle-wrapper.properties

-#Thu Feb 15 15:50:42 BRST 2018
+#Wed Aug 01 21:56:00 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

build.gradle

@@ -13,7 +13,7 @@ buildscript {
         classpath 'com.android.tools.build:gradle:3.3.0-alpha03'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
-        classpath 'com.google.gms:google-services:3.2.0'
+        classpath 'com.google.gms:google-services:4.0.2'
         classpath 'io.fabric.tools:gradle:1.25.4'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -34,4 +34,4 @@ allprojects {
 
 task clean(type: Delete) {
     delete rootProject.buildDir
-}
\ No newline at end of file
+}

dependencies.gradle

@@ -5,12 +5,12 @@ ext {
             compileSdk            : 28,
             targetSdk             : 28,
             minSdk                : 21,
-            buildTools            : '28.0.0-rc2',
+            buildTools            : '28.0.1',
             dokka                 : '0.9.16',
 
             // For app
             kotlin                : '1.2.51',
-            coroutine             : '0.23.1',
+            coroutine             : '0.24.0',
 
             appCompat             : '1.0.0-beta01',
             recyclerview          : '1.0.0-beta01',
@@ -21,9 +21,9 @@ ext {
 
             dagger                : '2.16',
             firebase              : '15.0.0',
-            playServices          : '15.0.0',
-            exoPlayer             : '2.6.0',
-            flexbox               : '0.3.2',
+            playServices          : '15.0.1',
+            exoPlayer             : '2.8.2',
+            flexbox               : '1.0.0',
             material              : '1.0.0-beta01',
 
             room                  : '2.0.0-beta01',
@@ -33,30 +33,30 @@ ext {
             rxAndroid             : '2.0.2',
 
             moshi                 : '1.6.0',
-            okhttp                : '3.10.0',
+            okhttp                : '3.11.0',
 
-            timber                : '4.7.0',
-            threeTenABP           : '1.0.5',
-            rxBinding             : '2.0.0',
+            timber                : '4.7.1',
+            threeTenABP           : '1.1.0',
+            rxBinding             : '2.1.1',
 
-            fresco                : '1.9.0',
+            fresco                : '1.10.0',
 
-            kotshi                : '1.0.2',
+            kotshi                : '1.0.4',
 
             frescoImageViewer     : '0.5.1',
-            markwon               : '1.0.6',
+            markwon               : '1.1.0',
             aVLoadingIndicatorView: '2.1.3',
 
             // For wearable
             wear                  : '2.3.0',
             playServicesWearable  : '15.0.1',
-            supportWearable       : '26.1.0',
+            supportWearable       : '27.1.1',
 
             // For testing
             junit                 : '4.12',
-            truth                 : '0.36',
-            espresso              : '3.1.0-alpha2',
-            mockito               : '2.10.0'
+            truth                 : '0.42',
+            espresso              : '3.1.0-alpha4',
+            mockito               : '2.21.0'
     ]
     libraries = [
             kotlin                : "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}",
@@ -121,10 +121,10 @@ ext {
             wearSupport           : "com.android.support:wear:${versions.supportWearable}",
 
             // For testing
-            junit                 : "junit:junit:$versions.junit",
+            junit                 : "junit:junit:${versions.junit}",
             espressoCore          : "androidx.test.espresso:espresso-core:${versions.espresso}",
             espressoIntents       : "androidx.test.espresso:espresso-intents:${versions.espresso}",
             roomTest              : "android.arch.persistence.room:testing:${versions.room}",
-            truth                 : "com.google.truth:truth:$versions.truth"
+            truth                 : "com.google.truth:truth:${versions.truth}"
     ]
-}
\ No newline at end of file
+}

gradle/wrapper/gradle-wrapper.properties

-#Fri May 18 17:08:16 IST 2018
+#Wed Aug 01 22:00:00 EDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-rc-2-all.zip
-distributionSha256Sum=9bc16f929e5920a9a27fef22c65a8ab8140d705e418de0159ca6eb7f08a74200
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
+distributionSha256Sum=39e2d5803bbd5eaf6c8efe07067b0e5a00235e8c71318642b2ed262920b27721

wear/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     buildToolsVersion versions.buildTools
 
     defaultConfig {