Merge branch 'develop-2.x' into feature/show-chat-list-using-sdk

44f09bc2 · Filipe de Lima Brito · b3fe7461 · f245c5d0 · 44f09bc2 · 44f09bc2
Commit 44f09bc2 authored Dec 27, 2017 by Filipe de Lima Brito
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

build.gradle app/build.gradle +1 -2

settings.gradle settings.gradle +2 -2

No files found.
--- a/app/build.gradle
+++ b/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

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