From 6de773b74279bca7605e547a2c6883d72fe5957f Mon Sep 17 00:00:00 2001 From: Toby Date: Sun, 15 Apr 2018 20:30:27 +0100 Subject: [PATCH] #57 move assembly plugin related stuff into it's own sbt file --- assembly.sbt | 16 ++++++++++++++++ build.sbt | 9 --------- 2 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 assembly.sbt diff --git a/assembly.sbt b/assembly.sbt new file mode 100644 index 0000000..0c411f9 --- /dev/null +++ b/assembly.sbt @@ -0,0 +1,16 @@ + +assemblyJarName in assembly := s"${name.value}-${version.value}.jar" + +// fixes https://github.com/tobyweston/temperature-machine/issues/39 +assemblyMergeStrategy in assembly := { + case PathList(xs @ _*) if xs.last == "module-info.class" => MergeStrategy.first + case x => + val oldStrategy = (assemblyMergeStrategy in assembly).value + oldStrategy(x) +} + +// Remove ScalaDoc generation +sources in(Compile, doc) := Seq.empty +publishArtifact in(Compile, packageDoc) := false + +addArtifact(artifact in(Compile, assembly), assembly) diff --git a/build.sbt b/build.sbt index a8d5381..b2aeb8a 100644 --- a/build.sbt +++ b/build.sbt @@ -6,8 +6,6 @@ version := "2.1" organization := "bad.robot" -assemblyJarName in assembly := s"${name.value}-${version.value}.jar" - scalaVersion := "2.12.4" mainClass in Compile := Some("bad.robot.temperature.Main") @@ -32,10 +30,3 @@ libraryDependencies ++= Seq( scalacOptions := Seq("-Xlint", "-Xfatal-warnings", "-deprecation", "-feature", "-language:implicitConversions,reflectiveCalls,higherKinds", "-Ypartial-unification") -// fixes https://github.com/tobyweston/temperature-machine/issues/39 -assemblyMergeStrategy in assembly := { - case PathList(xs @ _*) if xs.last == "module-info.class" => MergeStrategy.first - case x => - val oldStrategy = (assemblyMergeStrategy in assembly).value - oldStrategy(x) -} \ No newline at end of file