Skip to content

Commit

Permalink
okio assembly fix
Browse files Browse the repository at this point in the history
  • Loading branch information
davidangb committed Dec 3, 2023
1 parent 5c1154b commit 19d4a77
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions project/Merging.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ object Merging {
case x if x.endsWith("kotlin-stdlib.kotlin_module") => MergeStrategy.first
case x if x.contains("bouncycastle") => MergeStrategy.first
case x if x.endsWith("kotlin-stdlib-common.kotlin_module") => MergeStrategy.first
case x if x.endsWith("okio.kotlin_module") => MergeStrategy.first
case x if x.endsWith("arrow-git.properties") => MergeStrategy.concat

// For the following error:
Expand Down

0 comments on commit 19d4a77

Please sign in to comment.