Commit f245c5d0 authored by Lucio Maciel's avatar Lucio Maciel

Fix sdk path, disable multidex

parent 77610e63
...@@ -14,7 +14,7 @@ android { ...@@ -14,7 +14,7 @@ android {
versionCode 1 versionCode 1
versionName "2.0.0-beta1" versionName "2.0.0-beta1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled false
} }
buildTypes { buildTypes {
...@@ -51,7 +51,6 @@ dependencies { ...@@ -51,7 +51,6 @@ dependencies {
kapt libraries.daggerAndroidApt kapt libraries.daggerAndroidApt
implementation libraries.moshi implementation libraries.moshi
implementation libraries.moshiKotlin
implementation libraries.room implementation libraries.room
kapt libraries.roomProcessor kapt libraries.roomProcessor
......
...@@ -9,6 +9,7 @@ ext { ...@@ -9,6 +9,7 @@ ext {
kotlin : '1.2.10', kotlin : '1.2.10',
coroutine : '0.20', coroutine : '0.20',
dokka : '0.9.15', dokka : '0.9.15',
kotshi : '0.3.0-beta2',
// Main dependencies // Main dependencies
support : '27.0.2', support : '27.0.2',
...@@ -60,7 +61,6 @@ ext { ...@@ -60,7 +61,6 @@ ext {
rxandroid : "io.reactivex.rxjava2:rxandroid:${versions.rxandroid}", rxandroid : "io.reactivex.rxjava2:rxandroid:${versions.rxandroid}",
moshi : "com.squareup.moshi:moshi:${versions.moshi}", moshi : "com.squareup.moshi:moshi:${versions.moshi}",
moshiKotlin : "com.squareup.moshi:moshi-kotlin:${versions.moshi}",
okhttp : "com.squareup.okhttp3:okhttp:${versions.okhttp}", okhttp : "com.squareup.okhttp3:okhttp:${versions.okhttp}",
okhttpLogger : "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}", okhttpLogger : "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}",
......
include ':app', 'common', 'core', ':player' 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment