Merge pull request #381 from nightscout/dev2

Lints
This commit is contained in:
Milos Kozak 2021-02-28 12:10:37 +01:00 committed by GitHub
commit 642748b012
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View file

@ -30,6 +30,7 @@ buildscript {
dexmakerVersion = "1.2"
retrofit2Version = '2.9.0'
okhttp3Version = '4.9.0'
byteBuddyVersion = '1.10.21'
androidx_junit = '1.1.2'
androidx_rules = '1.4.0-alpha04'

View file

@ -134,9 +134,9 @@ dependencies {
exclude group: 'net.bytebuddy', module: 'byte-buddy-agent'
}
// to fix org.mockito:mockito-core dependency issues, fixed in mockito 3+
testImplementation 'net.bytebuddy:byte-buddy:1.10.20'
testImplementation 'net.bytebuddy:byte-buddy-android:1.10.20'
testImplementation 'net.bytebuddy:byte-buddy-agent:1.10.20'
testImplementation "net.bytebuddy:byte-buddy:$byteBuddyVersion"
testImplementation "net.bytebuddy:byte-buddy-android:$byteBuddyVersion"
testImplementation "net.bytebuddy:byte-buddy-agent:$byteBuddyVersion"
testImplementation "org.powermock:powermock-api-mockito2:${powermockVersion}"
testImplementation "org.powermock:powermock-module-junit4-rule-agent:${powermockVersion}"