Merge pull request #2077 from nextcloud/renovate/org.bouncycastle-bcpkix-jdk18on-1.x

Update dependency org.bouncycastle:bcpkix-jdk18on to v1.85

Author: tobiasKaminsky

library/build.gradle

@@ -73,7 +73,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'com.google.guava:guava:33.6.0-jre'
 
-    implementation 'org.bouncycastle:bcpkix-jdk18on:1.84'
+    implementation 'org.bouncycastle:bcpkix-jdk18on:1.85'
 
     spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0'
     spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.7.4'
@@ -173,7 +173,9 @@ android {
     packagingOptions {
         resources {
             excludes += 'META-INF/versions/9/OSGI-INF/MANIFEST*'
+            excludes += 'META-INF/LICENSE.md'
             pickFirst 'MANIFEST.MF' // workaround for duplicated manifest on some dependencies
+            pickFirst 'LICENSE.md' // workaround for duplicated manifest on some dependencies
         }
     }
 

sample_client/build.gradle

@@ -33,7 +33,9 @@ android {
     packagingOptions {
         resources {
             excludes += 'META-INF/versions/9/OSGI-INF/MANIFEST*'
+            excludes += 'META-INF/LICENSE.md'
             pickFirst 'MANIFEST.MF' // workaround for duplicated manifest on some dependencies
+            pickFirst 'LICENSE.md' // workaround for duplicated LICENSE.md on some dependencies
         }
     }