diff --git a/app/build.gradle b/app/build.gradle index 420df37e0..721718531 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,7 +54,7 @@ android { } } - testCoverage.jacocoVersion = "0.8.8" + testCoverage.jacocoVersion = "0.8.13" flavorDimensions = ["version"] @@ -85,6 +85,14 @@ android { androidResources { generateLocaleConfig true } + + packagingOptions { + resources { + excludes += "META-INF/LICENSE*" + excludes += "META-INF/versions/9/OSGI-INF/MANIFEST*" + pickFirst "MANIFEST.MF" // workaround for duplicated manifest on some dependencies + } + } } ext { @@ -100,7 +108,7 @@ dependencies { exclude group: 'commons-logging', module: 'commons-logging' } - implementation("com.github.nextcloud:android-library:2.19.1") { + implementation("com.github.nextcloud:android-library:2.20.0") { exclude group: 'org.ogce', module: 'xpp3' } diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 70388b989..5f5f6733c 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -7274,6 +7274,14 @@ + + + + + + + +