diff options
Diffstat (limited to 'project')
| -rw-r--r-- | project/Dependencies.scala | 17 | ||||
| -rw-r--r-- | project/Projects.scala | 23 | ||||
| -rw-r--r-- | project/build.properties | 2 |
3 files changed, 30 insertions, 12 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 4575c43d..39a777d5 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -23,10 +23,10 @@ object Dependencies { ) val sprayVersion = "1.3.2" - val akkaVersion = "2.3.9" + val akkaVersion = "2.3.10" val aspectjVersion = "1.8.5" val slf4jVersion = "1.7.7" - val playVersion = "2.3.8" +// val playVersion = "2.3.8" val sigarVersion = "1.6.5.132" val sprayJson = "io.spray" %% "spray-json" % "1.3.1" @@ -45,9 +45,9 @@ object Dependencies { val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % akkaVersion val akkaRemote = "com.typesafe.akka" %% "akka-remote" % akkaVersion 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.2.0" +// val play = "com.typesafe.play" %% "play" % playVersion +// val playWS = "com.typesafe.play" %% "play-ws" % playVersion +// val playTest = "org.scalatestplus" %% "play" % "1.2.0" val slf4Api = "org.slf4j" % "slf4j-api" % slf4jVersion val slf4nop = "org.slf4j" % "slf4j-nop" % slf4jVersion val slf4Jul = "org.slf4j" % "jul-to-slf4j" % slf4jVersion @@ -57,6 +57,13 @@ object Dependencies { val h2 = "com.h2database" % "h2" % "1.4.182" val el = "org.glassfish" % "javax.el" % "3.0.0" + + //play 2.4.x + val play24 = "com.typesafe.play" %% "play" % "2.4.0" + val playWS24 = "com.typesafe.play" %% "play-ws" % "2.4.0" + val playTest24 = "org.scalatestplus" %% "play" % "1.4.0-M2" + val typesafeConfig = "com.typesafe" % "config" % "1.3.0" + def compile (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "compile") def provided (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "provided") def test (deps: ModuleID*): Seq[ModuleID] = deps map (_ % "test") diff --git a/project/Projects.scala b/project/Projects.scala index 586ffdaf..6d863b97 100644 --- a/project/Projects.scala +++ b/project/Projects.scala @@ -1,5 +1,5 @@ /* ========================================================================================= - * Copyright © 2013-2014 the kamon project <http://kamon.io/> + * Copyright © 2013-2015 the kamon project <http://kamon.io/> * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file * except in compliance with the License. You may obtain a copy of the License at @@ -23,7 +23,7 @@ object Projects extends Build { lazy val kamon = Project("kamon", file(".")) .aggregate(kamonCore, kamonScala, kamonAkka, kamonSpray, kamonNewrelic, kamonPlayground, kamonTestkit, - kamonPlay, kamonStatsD, kamonDatadog, kamonSystemMetrics, kamonLogReporter, kamonAkkaRemote, kamonJdbc, kamonAnnotation) + kamonStatsD, kamonDatadog, kamonSystemMetrics, kamonLogReporter, kamonAkkaRemote, kamonJdbc, kamonAnnotation, kamonPlay24) .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(noPublishing: _*) @@ -36,7 +36,7 @@ object Projects extends Build { .settings( javacOptions in Compile ++= Seq("-XDignore.symbol.file"), libraryDependencies ++= - compile(akkaActor, hdrHistogram) ++ + compile(akkaActor, hdrHistogram, typesafeConfig) ++ provided(aspectJ) ++ optional(logback) ++ test(scalatest, akkaTestKit, akkaSlf4j, slf4Jul, slf4Log4j, logback)) @@ -124,16 +124,27 @@ object Projects extends Build { provided(aspectJ) ++ test(slf4Api, slf4nop)) - lazy val kamonPlay = Project("kamon-play", file("kamon-play")) +// lazy val kamonPlay = Project("kamon-play", file("kamon-play")) +// .dependsOn(kamonCore % "compile->compile;test->test", kamonScala, kamonAkka) +// .settings(basicSettings: _*) +// .settings(formatSettings: _*) +// .settings(aspectJSettings: _*) +// .settings( +// libraryDependencies ++= +// compile(play, playWS) ++ +// provided(aspectJ) ++ +// test(playTest, akkaTestKit, slf4Api)) + + lazy val kamonPlay24 = Project("kamon-play-24x", file("kamon-play-2.4.x")) .dependsOn(kamonCore % "compile->compile;test->test", kamonScala, kamonAkka) .settings(basicSettings: _*) .settings(formatSettings: _*) .settings(aspectJSettings: _*) .settings( libraryDependencies ++= - compile(play, playWS) ++ + compile(play24, playWS24, typesafeConfig) ++ provided(aspectJ) ++ - test(playTest, akkaTestKit, slf4Api)) + test(playTest24, akkaTestKit, slf4Api)) lazy val kamonStatsD = Project("kamon-statsd", file("kamon-statsd")) .dependsOn(kamonCore % "compile->compile;test->test") diff --git a/project/build.properties b/project/build.properties index 304ec924..a6e117b6 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.7
\ No newline at end of file +sbt.version=0.13.8 |