From 82cd39329aa79edde0fb12d5a8a770f227689f6f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 28 May 2019 14:22:24 +0000
Subject: [PATCH] Bump mockito-android from 2.27.0 to 2.27.5 (#354)

---
 .travis.yml      | 7 +++----
 app/build.gradle | 5 ++++-
 build.gradle     | 1 +
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 10824e32f..9ad4044ea 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 b1c9fc87d..38d5b6622 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 51407bd9f..4ed9ec686 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" }
     }
 }