diff options
| author | Ivan Topolnjak <ivantopo@gmail.com> | 2014-10-19 20:56:18 +0200 |
|---|---|---|
| committer | Ivan Topolnjak <ivantopo@gmail.com> | 2014-10-19 20:56:18 +0200 |
| commit | 4963b33e9c66cca8326d09537abce1ab2078ee9c (patch) | |
| tree | 31fcadcd9c953530ac370d30c8e7bdecc9f58de1 | |
| parent | fc22c55f1c5caac4a4921855c30b966722ec8157 (diff) | |
| download | Kamon-4963b33e9c66cca8326d09537abce1ab2078ee9c.tar.gz Kamon-4963b33e9c66cca8326d09537abce1ab2078ee9c.tar.bz2 Kamon-4963b33e9c66cca8326d09537abce1ab2078ee9c.zip | |
! build: upgrade dependencies.
| -rw-r--r-- | kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala | 2 | ||||
| -rw-r--r-- | project/Dependencies.scala | 22 | ||||
| -rw-r--r-- | project/Projects.scala | 4 |
3 files changed, 14 insertions, 14 deletions
diff --git a/kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala b/kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala index ef556e11..ecb8ff09 100644 --- a/kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala +++ b/kamon-newrelic/src/main/scala/kamon/newrelic/AgentJsonProtocol.scala @@ -33,7 +33,7 @@ object AgentJsonProtocol extends DefaultJsonProtocol { } implicit def seqWriter[T: JsonWriter] = new JsonWriter[Seq[T]] { - def write(seq: Seq[T]) = JsArray(seq.map(_.toJson).toList) + def write(seq: Seq[T]) = JsArray(seq.map(_.toJson).toVector) } implicit object MetricDetailWriter extends JsonWriter[NewRelic.Metric] { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 829f261a..354e5cbe 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,25 +7,25 @@ object Dependencies { "typesafe repo" at "http://repo.typesafe.com/typesafe/releases/" ) - val sprayVersion = "1.3.1" - val akkaVersion = "2.3.2" + val sprayVersion = "1.3.2" + val akkaVersion = "2.3.6" val aspectjVersion = "1.7.4" val slf4jVersion = "1.7.6" val playVersion = "2.3.4" - val sprayJson = "io.spray" %% "spray-json" % "1.2.6" - val sprayJsonLenses = "net.virtual-void" %% "json-lenses" % "0.5.3" - val scalatest = "org.scalatest" % "scalatest_2.10" % "2.0" + val sprayJson = "io.spray" %% "spray-json" % "1.3.0" + val sprayJsonLenses = "net.virtual-void" %% "json-lenses" % "0.5.4" + val scalatest = "org.scalatest" %% "scalatest" % "2.2.1" val logback = "ch.qos.logback" % "logback-classic" % "1.0.13" val aspectJ = "org.aspectj" % "aspectjrt" % aspectjVersion val aspectjWeaver = "org.aspectj" % "aspectjweaver" % aspectjVersion - val newrelic = "com.newrelic.agent.java" % "newrelic-api" % "3.1.0" + val newrelic = "com.newrelic.agent.java" % "newrelic-api" % "3.11.0" val snakeYaml = "org.yaml" % "snakeyaml" % "1.13" val hdrHistogram = "org.hdrhistogram" % "HdrHistogram" % "1.2.1" - val sprayCan = "io.spray" % "spray-can" % sprayVersion - val sprayRouting = "io.spray" % "spray-routing" % sprayVersion - val sprayTestkit = "io.spray" % "spray-testkit" % sprayVersion - val sprayClient = "io.spray" % "spray-client" % sprayVersion + val sprayCan = "io.spray" %% "spray-can" % sprayVersion + val sprayRouting = "io.spray" %% "spray-routing" % sprayVersion + val sprayTestkit = "io.spray" %% "spray-testkit" % sprayVersion + val sprayClient = "io.spray" %% "spray-client" % sprayVersion val akkaActor = "com.typesafe.akka" %% "akka-actor" % akkaVersion val akkaSlf4j = "com.typesafe.akka" %% "akka-slf4j" % akkaVersion val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion @@ -33,7 +33,7 @@ object Dependencies { val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % akkaVersion val play = "com.typesafe.play" %% "play" % playVersion val playWS = "com.typesafe.play" %% "play-ws" % playVersion - val playTest = "org.scalatestplus" %% "play" % "1.1.0" + val playTest = "org.scalatestplus" %% "play" % "1.2.0" val slf4Api = "org.slf4j" % "slf4j-api" % slf4jVersion val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion val scalaCompiler = "org.scala-lang" % "scala-compiler" % Settings.ScalaVersion diff --git a/project/Projects.scala b/project/Projects.scala index 8828a62d..20da3fbc 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -23,9 +23,9 @@ object Projects extends Build { mappings in (Compile, packageBin) ++= mappings.in(kamonMacros, Compile, packageBin).value, mappings in (Compile, packageSrc) ++= mappings.in(kamonMacros, Compile, packageSrc).value, libraryDependencies ++= - compile(akkaActor, aspectJ, hdrHistogram) ++ + compile(akkaActor, aspectJ, hdrHistogram, scalazConcurrent) ++ optional(akkaRemote, akkaCluster, logback, aspectjWeaver) ++ - test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, logback, scalazConcurrent)) + test(scalatest, akkaTestKit, sprayTestkit, akkaSlf4j, logback)) lazy val kamonSpray = Project("kamon-spray", file("kamon-spray")) |