From 19d4a77163be7da55fa912b6ac74d417e40bd6b6 Mon Sep 17 00:00:00 2001 From: David An Date: Sun, 3 Dec 2023 09:28:37 -0500 Subject: [PATCH] okio assembly fix --- project/Merging.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/project/Merging.scala b/project/Merging.scala index c7628120c..a53e32c55 100644 --- a/project/Merging.scala +++ b/project/Merging.scala @@ -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: