From b90c2562c6223d91d2739cbdfd3962a9042fba5e Mon Sep 17 00:00:00 2001 From: Hao Huang Date: Wed, 8 Mar 2017 13:39:52 -0800 Subject: change the assembly strategy for org.slf4j.impl.StaticLoggerBinder in logback --- src/main/scala/xyz.driver.sbt/SbtSettings.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From b80b71a71577287a3dfe0fa3cd79957b00d39b8a Mon Sep 17 00:00:00 2001 From: Hao Huang Date: Wed, 8 Mar 2017 14:00:15 -0800 Subject: Upgrade sbt assembly plugin --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index a414cb1..831def8 100644 --- a/build.sbt +++ b/build.sbt @@ -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") -- cgit v1.2.3