Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into...

Merge branch 'develop-2.x' of github.com:RocketChat/Rocket.Chat.Android into layout/finishing-authentication-screens

app/build.gradle

@@ -14,7 +14,7 @@ android {
         versionCode 1
         versionName "2.0.0-beta1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        multiDexEnabled true
+        multiDexEnabled false
     }
 
     buildTypes {
@@ -51,7 +51,6 @@ dependencies {
     kapt libraries.daggerAndroidApt
 
     implementation libraries.moshi
-    implementation libraries.moshiKotlin
 
     implementation libraries.room
     kapt libraries.roomProcessor

dependencies.gradle

@@ -9,6 +9,7 @@ ext {
         kotlin            : '1.2.10',
         coroutine         : '0.20',
         dokka             : '0.9.15',
+        kotshi            : '0.3.0-beta2',
 
         // Main dependencies
         support                : '27.0.2',

settings.gradle

 include ':app', 'common', 'core', ':player'
 
-project(':common').projectDir = new File(settingsDir, '../Rocket.Chat.Kotlin.Sdk/common')
-project(':core').projectDir = new File(settingsDir, '../Rocket.Chat.Kotlin.Sdk/core')
\ No newline at end of file
+project(':common').projectDir = new File(settingsDir, '../Rocket.Chat.Kotlin.SDK/common')
+project(':core').projectDir = new File(settingsDir, '../Rocket.Chat.Kotlin.SDK/core')