diff options
| -rw-r--r-- | build.sbt | 2 | ||||
| -rw-r--r-- | src/main/scala/xyz.driver.sbt/SbtSettings.scala | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -17,7 +17,7 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.8.0") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1") addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "0.8.5") addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.1.4") -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3") +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4") addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3") addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.0") diff --git a/src/main/scala/xyz.driver.sbt/SbtSettings.scala b/src/main/scala/xyz.driver.sbt/SbtSettings.scala index 0a16657..e266f3a 100644 --- a/src/main/scala/xyz.driver.sbt/SbtSettings.scala +++ b/src/main/scala/xyz.driver.sbt/SbtSettings.scala @@ -325,7 +325,7 @@ object SbtSettings extends AutoPlugin { .settings(// for assembly plugin test in assembly := {}, assemblyMergeStrategy in assembly := { - case PathList("org", "slf4j", "impl", xs@_*) => MergeStrategy.rename + case PathList("org", "slf4j", "impl", xs@_*) => MergeStrategy.first case "logback.xml" => MergeStrategy.first case strategy: String => val oldStrategy = (assemblyMergeStrategy in assembly).value |