mirror of https://github.com/nextcloud/android
Merge pull request #10767 from nextcloud/dependabot/gradle/mockkVersion-1.13.2
Bump mockkVersion from 1.12.5 to 1.13.2
This commit is contained in:
commit
e9c1013298
|
@ -156,7 +156,8 @@ android {
|
|||
// see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
|
||||
packagingOptions {
|
||||
resources {
|
||||
excludes += ['META-INF/LICENSE.txt', 'META-INF/LICENSE']
|
||||
excludes += 'META-INF/LICENSE*'
|
||||
pickFirst 'MANIFEST.MF' // workaround for duplicated manifest on some dependencies
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ buildscript {
|
|||
androidLibraryVersion = "master-SNAPSHOT"
|
||||
mockitoVersion = "4.8.0"
|
||||
mockitoKotlinVersion = "4.0.0"
|
||||
mockkVersion = "1.12.5"
|
||||
mockkVersion = "1.13.2"
|
||||
espressoVersion = "3.4.0"
|
||||
workRuntime = "2.7.1"
|
||||
fidoVersion = "4.1.0"
|
||||
|
|
Loading…
Reference in New Issue