Add bouncycastle to merge strategy

broadinstitute · May 30, 2024 · 0c4edcd · 0c4edcd
1 parent 5892e88
commit 0c4edcd
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/project/Merging.scala b/project/Merging.scala
@@ -7,13 +7,15 @@ object Merging {
     case PathList("javax", "activation", _ @_*) => MergeStrategy.first
     case PathList("javax", "xml", _ @_*) => MergeStrategy.first
     case PathList("google", "protobuf", _ @_*) => MergeStrategy.first
+    case PathList("org", "bouncycastle", _ @_*) => MergeStrategy.first
     case x if x.endsWith("/ModuleUtil.class") => MergeStrategy.first
     case PathList("META-INF", "versions", "9", "module-info.class") => MergeStrategy.first
     case PathList("META-INF", "io.netty.versions.properties") => MergeStrategy.first
     case PathList("META-INF", "kotlin-result.kotlin_module") => MergeStrategy.first
     case PathList("META-INF", "kotlin-stdlib.kotlin_module") => MergeStrategy.first
     case PathList("META-INF", "kotlin-stdlib-common.kotlin_module") => MergeStrategy.first
     case PathList("META-INF", "okio.kotlin_module") => MergeStrategy.first
+    case PathList("META-INF", "versions", "9", "OSGI-INF", "MANIFEST.MF") => MergeStrategy.first
     case PathList("mozilla", "public-suffix-list.txt") => MergeStrategy.first
     case "module-info.class" =>
       MergeStrategy.discard