diff --git a/.travis.yml b/.travis.yml index 10824e32..9ad4044e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,9 @@ cache: - $HOME/.gradle/caches/ - $HOME/.gradle/wrapper/ -#branches: -# only: -# - master -# - 0.8.x +branches: + only: + - develop android: licenses: diff --git a/app/build.gradle b/app/build.gradle index b1c9fc87..38d5b662 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -146,9 +146,12 @@ dependencies { androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.ext:junit:1.1.0' androidTestImplementation "io.mockk:mockk-android:1.9.2" - androidTestImplementation 'org.mockito:mockito-android:2.27.0' androidTestImplementation "androidx.room:room-testing:2.1.0-beta01" androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version" + androidTestImplementation "org.mockito:mockito-core:2.27.2" + androidTestImplementation('org.mockito:mockito-android:2.27.5') { + exclude group: 'org.mockito', module: 'mockito-core' + } } apply plugin: 'com.google.gms.google-services' diff --git a/build.gradle b/build.gradle index 51407bd9..4ed9ec68 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,7 @@ allprojects { jcenter() maven { url 'https://jitpack.io' } maven { url "https://kotlin.bintray.com/kotlinx/" } + maven { url "https://dl.bintray.com/mockito/maven" } } }