Skip to content

Commit

Permalink
Document the need for packaging rule, and switch to merges strategy
Browse files Browse the repository at this point in the history
  • Loading branch information
MGaetan89 committed Dec 21, 2023
1 parent 8e2b114 commit f34f1b8
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions pillarbox-player/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit f34f1b8

Please sign in to comment.