fix sbt assembly (042e09cc) · Commits · github_fork / Clip

fnordmetric-enterprise/build.sbt

+8 −5

Original line number	Diff line number	Diff line
		@@ -10,17 +10,13 @@ mainClass in (Compile, run) := Some("com.fnordmetric.enterprise.FnordMetric")

		scalaSource in Compile <<= baseDirectory(_ / "src")

		scalaSource in Test <<= baseDirectory(_ / "test")

		scalaVersion := "2.9.1"

		resolvers += "Couchbase Maven2 Repo" at "http://files.couchbase.com/maven2"

		libraryDependencies += "org.eclipse.jetty" % "jetty-server" % "8.1.8.v20121106"

		libraryDependencies += "org.eclipse.jetty" % "jetty-websocket" % "8.1.8.v20121106"

		libraryDependencies += "org.scalatest" %% "scalatest" % "2.0.M1" % "test"
		libraryDependencies += "org.eclipse.jetty" % "jetty-server" % "8.1.8.v20121106"

		libraryDependencies += "io.netty" % "netty" % "3.6.0.Final"

		@@ -28,4 +24,11 @@ assemblySettings

		jarName in assembly <<= (version) { v => "FnordMetric-Enterprise-v" + v + ".jar" }

		mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) =>
		{
		case "about.html" => MergeStrategy.discard
		case x => old(x)
		}
		}

		fork in run := true

deleted100644 → 0

+0 −10

Original line number	Diff line number	Diff line
		import collection.mutable.Stack
		import org.scalatest._

		class FnordSpec extends FlatSpec {

		it should "1 == 1" in {
		assert(1 == 1)
		}

		}