From bbd52dcca66caa3cbd78478a1d075ff54da4f65a Mon Sep 17 00:00:00 2001 From: Ivan Topolnjak Date: Mon, 24 Apr 2017 14:10:46 +0200 Subject: bring the new skeleton into place --- build.sbt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index 60d4ad43..65fc7811 100644 --- a/build.sbt +++ b/build.sbt @@ -13,8 +13,6 @@ * ========================================================================================= */ -parallelExecution in Test in Global := false - lazy val kamon = (project in file(".")) .settings(moduleName := "kamon") .settings(noPublishing: _*) @@ -24,19 +22,24 @@ lazy val kamon = (project in file(".")) lazy val core = (project in file("kamon-core")) .settings(moduleName := "kamon-core") .settings( - libraryDependencies ++= - compileScope(akkaDependency("actor").value, hdrHistogram, slf4jApi) ++ - providedScope(aspectJ) ++ - optionalScope(logbackClassic) ++ - testScope(scalatest, akkaDependency("testkit").value, akkaDependency("slf4j").value, logbackClassic)) + scalaVersion := "2.12.1", + resolvers += Resolver.mavenLocal, + libraryDependencies ++= Seq( + "com.typesafe" % "config" % "1.3.1", + "org.slf4j" % "slf4j-api" % "1.7.7", + "org.hdrhistogram" % "HdrHistogram" % "2.1.9", + "io.opentracing" % "opentracing-api" % "0.21.1-SNAPSHOT", + "org.scalatest" %% "scalatest" % "3.0.1" % "test" + ) +) lazy val testkit = (project in file("kamon-testkit")) .dependsOn(core) - .settings(moduleName := "kamon-testkit") + .settings(moduleName := "kamon-testkit", resolvers += Resolver.mavenLocal) .settings( libraryDependencies ++= compileScope(akkaDependency("actor").value, akkaDependency("testkit").value) ++ providedScope(aspectJ) ++ - testScope(slf4jApi, slf4jnop)) + testScope(slf4jApi, slf4jnop)) \ No newline at end of file -- cgit v1.2.3