Commit 42661a21 authored by Filipe de Lima Brito's avatar Filipe de Lima Brito

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
parents 3a1d532d f245c5d0
...@@ -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
......
...@@ -2,13 +2,14 @@ import org.gradle.internal.jvm.Jvm ...@@ -2,13 +2,14 @@ import org.gradle.internal.jvm.Jvm
ext { ext {
versions = [ versions = [
java : JavaVersion.VERSION_1_8, java : JavaVersion.VERSION_1_8,
compileSdk : 27, compileSdk : 27,
targetSdk : 27, targetSdk : 27,
buildTools : '27.0.0', buildTools : '27.0.0',
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',
......
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