sadorowo/wulkanowy-mod
1
0
Fork 0
forked from github/wulkanowy-mirror
Code Issues Pull Requests Actions Releases 5 Activity

Bump mockito-android from 2.27.0 to 2.27.5 (#354)

Browse Source
This commit is contained in:
dependabot-preview[bot] 2019-05-28 14:22:24 +00:00 committed by GitHub
parent b38e0d04e7
commit 82cd39329a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@ -11,10 +11,9 @@ cache:
- $HOME/.gradle/caches/ - $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/ - $HOME/.gradle/wrapper/
#branches: branches:
# only: only:
# - master - develop
# - 0.8.x
android: android:
licenses: licenses:

5
app/build.gradle
View File

@ -146,9 +146,12 @@ dependencies {
androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test:runner:1.1.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.0' androidTestImplementation 'androidx.test.ext:junit:1.1.0'
androidTestImplementation "io.mockk:mockk-android:1.9.2" 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 "androidx.room:room-testing:2.1.0-beta01"
androidTestImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version" 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' apply plugin: 'com.google.gms.google-services'

1
build.gradle
View File

@ -35,6 +35,7 @@ allprojects {
jcenter() jcenter()
maven { url 'https://jitpack.io' } maven { url 'https://jitpack.io' }
maven { url "https://kotlin.bintray.com/kotlinx/" } maven { url "https://kotlin.bintray.com/kotlinx/" }
maven { url "https://dl.bintray.com/mockito/maven" }
} }
} }