nextcloud
/
android
mirror of https://github.com/nextcloud/android
0
0
Fork 0
Code Issues Releases Wiki Activity

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:
Álvaro Brey 2022-09-30 10:42:27 +02:00 committed by GitHub
parent 934d7ae20f 6c217cffa6
commit e9c1013298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -156,7 +156,8 @@ android {
// see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
packagingOptions { packagingOptions {
resources { resources {
excludes += ['META-INF/LICENSE.txt', 'META-INF/LICENSE'] excludes += 'META-INF/LICENSE*'
pickFirst 'MANIFEST.MF' // workaround for duplicated manifest on some dependencies
} }
} }

2
build.gradle
View File

@ -9,7 +9,7 @@ buildscript {
androidLibraryVersion = "master-SNAPSHOT" androidLibraryVersion = "master-SNAPSHOT"
mockitoVersion = "4.8.0" mockitoVersion = "4.8.0"
mockitoKotlinVersion = "4.0.0" mockitoKotlinVersion = "4.0.0"
mockkVersion = "1.12.5" mockkVersion = "1.13.2"
espressoVersion = "3.4.0" espressoVersion = "3.4.0"
workRuntime = "2.7.1" workRuntime = "2.7.1"
fidoVersion = "4.1.0" fidoVersion = "4.1.0"