Commit ed0f72dc authored by Filipe de Lima Brito's avatar Filipe de Lima Brito

Add tests dependencies and Kotlin tests directories

parent a891e28b
...@@ -31,6 +31,7 @@ buildscript { ...@@ -31,6 +31,7 @@ buildscript {
android { android {
compileSdkVersion rootProject.ext.compileSdkVersion compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig { defaultConfig {
applicationId "chat.rocket.android" applicationId "chat.rocket.android"
minSdkVersion 16 minSdkVersion 16
...@@ -38,10 +39,10 @@ android { ...@@ -38,10 +39,10 @@ android {
versionCode 28 versionCode 28
versionName "1.0.16" versionName "1.0.16"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true vectorDrawables.useSupportLibrary = true
multiDexEnabled true multiDexEnabled true
} }
signingConfigs { signingConfigs {
release { release {
storeFile project.rootProject.file('Rocket.jks').getCanonicalFile() storeFile project.rootProject.file('Rocket.jks').getCanonicalFile()
...@@ -50,6 +51,7 @@ android { ...@@ -50,6 +51,7 @@ android {
keyPassword System.getenv("KEY_PASSWORD") keyPassword System.getenv("KEY_PASSWORD")
} }
} }
buildTypes { buildTypes {
release { release {
minifyEnabled false minifyEnabled false
...@@ -57,20 +59,29 @@ android { ...@@ -57,20 +59,29 @@ android {
signingConfig signingConfigs.release signingConfig signingConfigs.release
} }
} }
sourceSets {
test.java.srcDirs += 'src/test/kotlin'
androidTest.java.srcDirs += 'src/androidTest/kotlin'
}
packagingOptions { packagingOptions {
exclude 'META-INF/LICENSE.txt' exclude 'META-INF/LICENSE.txt'
exclude 'META-INF/NOTICE.txt' exclude 'META-INF/NOTICE.txt'
exclude 'META-INF/rxjava.properties' exclude 'META-INF/rxjava.properties'
} }
compileOptions { compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
lintOptions { lintOptions {
//avoiding okio error: https://github.com/square/okhttp/issues/896 //avoiding okio error: https://github.com/square/okhttp/issues/896
lintConfig file("lint.xml") lintConfig file("lint.xml")
} }
} }
play { play {
jsonFile = file('rocket-chat.json') jsonFile = file('rocket-chat.json')
track = "${track}" track = "${track}"
...@@ -99,6 +110,8 @@ dependencies { ...@@ -99,6 +110,8 @@ dependencies {
compile 'com.android.support:multidex:1.0.1' compile 'com.android.support:multidex:1.0.1'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion" compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$rootProject.ext.kotlinVersion"
testCompile "org.jetbrains.kotlin:kotlin-test:$rootProject.ext.kotlinVersion"
testCompile "org.jetbrains.kotlin:kotlin-test-junit:$rootProject.ext.kotlinVersion"
compile "com.google.firebase:firebase-core:$playLibVersion" compile "com.google.firebase:firebase-core:$playLibVersion"
compile "com.google.firebase:firebase-crash:$playLibVersion" compile "com.google.firebase:firebase-crash:$playLibVersion"
......
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