diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2017-08-15 00:06:26 +0200 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2017-08-15 00:06:26 +0200 |
| commit | 6721d325d018756296213ac8f9129bc304a21afb (patch) | |
| tree | e08a5ce92802f521be228beae0ddb4ef258d0066 /build.sbt | |
| parent | ac3b72e27765ceec4cc3958b0fa7eaba0299f017 (diff) | |
| parent | a949c875684d78818224cd2ca7aaf79aa7878724 (diff) | |
| download | Kamon-6721d325d018756296213ac8f9129bc304a21afb.tar.gz Kamon-6721d325d018756296213ac8f9129bc304a21afb.tar.bz2 Kamon-6721d325d018756296213ac8f9129bc304a21afb.zip | |
Merge remote-tracking branch 'ivantopo/wip/moving-ot-support-to-a-separeate-project' into kamon-1.0-develop
Diffstat (limited to 'build.sbt')
| -rw-r--r-- | build.sbt | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -16,11 +16,12 @@ scalaVersion := "2.11.8" crossScalaVersions := Seq("2.12.2", "2.11.8", "2.10.6") +concurrentRestrictions in Global += Tags.limit(Tags.Test, 1) lazy val kamon = (project in file(".")) .settings(moduleName := "kamon") .settings(noPublishing: _*) - .aggregate(core)//, testkit) + .aggregate(core) lazy val core = (project in file("kamon-core")) @@ -33,16 +34,14 @@ lazy val core = (project in file("kamon-core")) libraryDependencies ++= Seq( "com.typesafe" % "config" % "1.3.1", "org.slf4j" % "slf4j-api" % "1.7.7", - "ch.qos.logback" % "logback-classic" % "1.2.2", "org.hdrhistogram" % "HdrHistogram" % "2.1.9", - "io.opentracing" % "opentracing-api" % "0.30.0", - "io.opentracing" % "opentracing-util" % "0.30.0", - "com.lihaoyi" %% "fansi" % "0.2.4", - //"uk.org.lidalia" % "slf4j-test" % "1.1.0" % "test", - "org.scalatest" %% "scalatest" % "3.0.1" % "test" + "com.lihaoyi" %% "fansi" % "0.2.4", + "org.scalatest" %% "scalatest" % "3.0.1" % "test", + "ch.qos.logback" % "logback-classic" % "1.2.2" % "test" ) ) + // //lazy val testkit = (project in file("kamon-testkit")) // .settings(moduleName := "kamon-testkit", resolvers += Resolver.mavenLocal) |