Skip to content

Commit 6c91f33

Browse files
author
Catherine Gasnier
committed
fix build
Summary: Test Plan: Reviewers: Subscribers: Tasks: Tags:
1 parent 40f7f5c commit 6c91f33

1 file changed

Lines changed: 11 additions & 0 deletions

File tree

build.sbt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ lazy val mavenPlugin = project
241241
lazy val cli = project
242242
.in(file("scip-java"))
243243
.settings(
244+
fatjarPackageSettings,
244245
moduleName := "scip-java",
245246
(Compile / mainClass) := Some("com.sourcegraph.scip_java.ScipJava"),
246247
(run / baseDirectory) := (ThisBuild / baseDirectory).value,
@@ -567,8 +568,18 @@ lazy val fatjarPackageSettings = List[Def.Setting[_]](
567568
MergeStrategy.discard
568569
case PathList("sun", _ @_*) =>
569570
MergeStrategy.discard
571+
case "BUILD" =>
572+
MergeStrategy.discard
573+
case PathList("META-INF", f) if f.endsWith(".kotlin_module") =>
574+
MergeStrategy.first
575+
case PathList("META-INF", "sisu", "javax.inject.Named") =>
576+
MergeStrategy.concat
570577
case PathList("META-INF", "versions", "9", "module-info.class") =>
571578
MergeStrategy.discard
579+
case PathList("org", "codehaus", "plexus", _ @_*) =>
580+
MergeStrategy.first
581+
case "overview.html" =>
582+
MergeStrategy.first
572583
case x =>
573584
val oldStrategy = (assembly / assemblyMergeStrategy).value
574585
oldStrategy(x)

0 commit comments

Comments
 (0)