From c0dc2ab3f5352a609aa134232cb2458b4aef3d41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Muller?= <gaetan.muller@rts.ch>
Date: Thu, 21 Dec 2023 08:57:02 +0100
Subject: [PATCH] Document the need for `packaging` rule, and switch to
 `merges` strategy

---
 pillarbox-player/build.gradle.kts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pillarbox-player/build.gradle.kts b/pillarbox-player/build.gradle.kts
index 4017a377c..222f2395a 100644
--- a/pillarbox-player/build.gradle.kts
+++ b/pillarbox-player/build.gradle.kts
@@ -43,10 +43,14 @@ android {
             withJavadocJar()
         }
     }
+
+    // Mockk includes some licenses information, which may conflict with other license files. This block merges all licenses together.
+    // Mockk excludes all licenses instead:
+    // https://github.com/mockk/mockk/blob/f879502a044c83c2a5fd52992f20903209eb34f3/modules/mockk-android/build.gradle.kts#L14-L19
     packaging {
         resources {
-            excludes += "META-INF/LICENSE.md"
-            excludes += "META-INF/LICENSE-notice.md"
+            merges += "META-INF/LICENSE.md"
+            merges += "META-INF/LICENSE-notice.md"
         }
     }
     testOptions {