Remove dependency on global Play object playframework#147

- must be initialized manually

statsd/build.sbt

@@ -1,38 +1,33 @@
+import play.core.PlayVersion
+
 name := "play-statsd"
 
 organization := "com.typesafe.play.plugins"
 
-version := "2.3.0"
-
-scalaVersion := "2.11.1"
+version := "2.4.0"
 
-crossScalaVersions := Seq("2.11.1", "2.10.4")
+scalaVersion in ThisBuild := "2.11.8"
 
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 libraryDependencies ++= Seq(
-  "com.typesafe.play" %% "play" % "2.3.0" % "provided",
-  "com.typesafe.play"  %% "play-test" % "2.3.0" % "test"
+  "com.typesafe.play" %% "play" % PlayVersion.current % "provided",
+  "com.typesafe.play"  %% "play-test" % PlayVersion.current % "test",
+  specs2 % "test"
 )
 
+resolvers += "scalaz-bintray" at "http://dl.bintray.com/scalaz/releases"
+
 parallelExecution in Test := false
 
 testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v")
 
-publishTo <<= (version) { version: String =>
+publishTo <<= version { version: String =>
   val nexus = "https://private-repo.typesafe.com/typesafe/"
   if (version.trim.endsWith("SNAPSHOT")) Some("snapshots" at nexus + "maven-snapshots/") 
   else                                   Some("releases"  at nexus + "maven-releases/")
 }
 
-javacOptions ++= Seq("-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-encoding", "UTF-8")
-
-scalacOptions += "-deprecation"
-
-lazy val root = project in file(".")
+lazy val root: Project = project in file(".") aggregate sample
 
-lazy val sample = (project in file("sample/sample-statsd"))
-  .enablePlugins(PlayScala)
-  .settings(
-    Keys.fork in Test := false
-  ).dependsOn(root).aggregate(root)
+lazy val sample = project in file("sample/sample-statsd") dependsOn (LocalRootProject % "test->test;compile->compile")

statsd/project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.5
+sbt.version=0.13.11

statsd/project/plugins.sbt

@@ -5,4 +5,4 @@
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.0")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.4.3")

statsd/sample/sample-statsd/app/Global.scala

@@ -1,4 +1,10 @@
+import play.api.Application
 import play.api.mvc.WithFilters
-import play.modules.statsd.api.StatsdFilter
+import play.modules.statsd.api.{Statsd, StatsdFilter}
 
-object Global extends WithFilters(new StatsdFilter)
+object Global extends WithFilters(new StatsdFilter) {
+  override def onStart(app: Application) = {
+    Statsd.init(app.configuration)
+    super.onStart(app)
+  }
+}

statsd/sample/sample-statsd/build.sbt

@@ -0,0 +1,5 @@
+enablePlugins(PlayScala)
+
+libraryDependencies += ws
+
+Keys.fork in Test := false

statsd/sample/sample-statsd/test/IntegrationTest.scala → statsd/sample/sample-statsd/test/IntegrationSpec.scala

@@ -1,16 +1,20 @@
 package test
 
-import java.net.{SocketTimeoutException, DatagramPacket, DatagramSocket}
+import java.net.{DatagramPacket, DatagramSocket, SocketTimeoutException}
+
+import org.specs2.execute.AsResult
 import org.specs2.mutable._
+import play.api.libs.ws.ning.NingWSClient
 import play.api.test.Helpers._
 import play.api.test._
-import org.specs2.execute.{AsResult, Result}
-import collection.mutable.ListBuffer
-import play.api.libs.ws.WS
-import concurrent.Await
-import concurrent.duration.Duration
 
-object IntegrationTestSpec extends Specification {
+import scala.collection.mutable.ListBuffer
+import scala.concurrent.Await
+import scala.concurrent.duration.Duration
+
+object IntegrationSpec extends Specification {
+  def WS = NingWSClient()
+
   "statsd filters" should {
 
     "report stats on /" in new Setup {
@@ -53,16 +57,6 @@ object IntegrationTestSpec extends Specification {
       receive(count("sample.routes.async.get"), timing("sample.routes.async.get"), combinedTime, combinedSuccess, combined200)
     }
 
-    "report stats on failure" in new Setup {
-      makeWsRequest("/sync/failure")
-      receive(count("sample.routes.sync.failure.get"), timing("sample.routes.sync.failure.get"), combinedTime, combinedError, combined500)
-    }
-
-    "report stats on failure thrown in async" in new Setup {
-      makeWsRequest("/async/failure")
-      receive(count("sample.routes.async.failure.get"), timing("sample.routes.async.failure.get"), combinedTime, combinedError, combined500)
-    }
-
     "report stats on action returning 503" in new Setup {
       makeRequest("/error", 503)
       receive(count("sample.routes.error.get"), timing("sample.routes.error.get"), combinedTime, combinedError, combined503)