Skip to content

Commit

Permalink
adjusted assembly merge strategy
Browse files Browse the repository at this point in the history
  • Loading branch information
pbartusch committed Oct 23, 2023
1 parent 17d3f90 commit 7a5e60f
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import com.typesafe.sbt.GitBranchPrompt

name := "search-management-ui"
version := "4.0.1"
version := "4.0.2"
maintainer := "Contact productful.io <hello@productful.io>"

scalaVersion := "2.12.17"

Expand Down Expand Up @@ -84,6 +85,9 @@ dependencyOverrides ++= {
assembly / mainClass := Some("play.core.server.ProdServerStart")
assembly / fullClasspath += Attributed.blank(PlayKeys.playPackageAssets.value)

/*
// TODO Need to doublecheck that merge strategy below does entail all relevant aspects here:
assembly / assemblyMergeStrategy := {
case manifest if manifest.contains("MANIFEST.MF") =>
// We don't need manifest files since sbt-assembly will create
Expand All @@ -97,6 +101,11 @@ assembly / assemblyMergeStrategy := {
val oldStrategy = (assembly / assemblyMergeStrategy).value
oldStrategy(x)
}
*/
assembly / assemblyMergeStrategy := {
case PathList("META-INF", xs @ _*) => MergeStrategy.discard
case x => MergeStrategy.first
}

lazy val dockerNamespace = "querqy"
lazy val dockerRepo = "smui"
Expand Down

0 comments on commit 7a5e60f

Please sign in to comment.