upgraded to scala 2.11.4

.gitignore

@@ -1,3 +1,5 @@
 target/
 .idea/
-.idea_modules/
+.idea_modules/
+publish.sbt
+

project/Build.scala

@@ -8,7 +8,7 @@ object BuildSettings {
     organization := "eu.piotrbuda",
     name := "scalawebsocket",
     version := "0.1.1",
-    scalaVersion := "2.10.1",
+    scalaVersion := "2.11.4",
     publishMavenStyle := true,
     publishTo <<= version {
       (v: String) =>
@@ -39,13 +39,13 @@ object BuildSettings {
 }
 
 object Dependencies {
-  val asynchttpclient = "com.ning" % "async-http-client" % "1.7.13"
+  val asynchttpclient = "com.ning" % "async-http-client" % "1.8.11"
 
   //logging
-  val scalalogging = "com.typesafe" %% "scalalogging-log4j" % "1.0.1"
+  val scalalogging = "com.typesafe.scala-logging" %% "scala-logging" % "3.1.0"
   val log4japi = "org.apache.logging.log4j" % "log4j-api" % "2.0-beta4"
   val log4jcore = "org.apache.logging.log4j" % "log4j-core" % "2.0-beta4"
-  val logback = "ch.qos.logback" % "logback-classic" % "1.0.9"
+  val logback = "ch.qos.logback" % "logback-classic" % "1.1.1"
 
   val logging = Seq(scalalogging, log4japi, log4jcore, logback)
 
@@ -57,7 +57,7 @@ object Dependencies {
 
   val jetty = Seq(jettyServer, jettyWebsocket, jettyServlet, jettyServlets)
 
-  val scalatest = "org.scalatest" %% "scalatest" % "1.9.1" % "test"
+  val scalatest = "org.scalatest" %% "scalatest" % "2.2.1" % "test"
 }
 
 object SWSBuild extends Build {
@@ -67,4 +67,4 @@ object SWSBuild extends Build {
 
   val root = Project("scalawebsocket", file("."), settings = buildSettings)
     .settings(libraryDependencies := Seq(asynchttpclient, scalatest) ++ logging ++ jetty)
-}
+}

project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.3
+sbt.version=0.13.6

project/project/SWSPlugins.scala

@@ -2,6 +2,6 @@ import sbt._
 
 object SWSPlugins extends Build {
   val plugins = Project("SWSPlugins", file("."))
-    .settings(addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.3.0"))
+    .settings(addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0"))
     .settings(addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8"))
-}
+}

src/main/scala/scalawebsocket/WebSocket.scala

@@ -18,7 +18,7 @@ package scalawebsocket
 
 import com.ning.http.client.{websocket, AsyncHttpClient}
 import com.ning.http.client.websocket.{WebSocketTextListener, WebSocketByteListener, WebSocketUpgradeHandler}
-import com.typesafe.scalalogging.log4j.Logging
+import com.typesafe.scalalogging.LazyLogging
 
 object WebSocket {
   def apply() = {
@@ -36,7 +36,7 @@ object WebSocket {
   *
   * @param client preconfigured instance of the [[com.ning.http.client.AsyncHttpClient]]
   */
-class WebSocket(client: AsyncHttpClient) extends Logging {
+class WebSocket(client: AsyncHttpClient) extends LazyLogging {
   self =>
 
   type OnTextMessageHandler = String => Unit

src/test/scala/scalawebsocket/BaseTest.scala

@@ -17,40 +17,40 @@
 package scalawebsocket
 
 import org.eclipse.jetty.server.nio.SelectChannelConnector
-import com.typesafe.scalalogging.log4j.Logging
-import org.scalatest.matchers.ShouldMatchers
-import org.scalatest.{FlatSpec, BeforeAndAfterAll}
+import com.typesafe.scalalogging.LazyLogging
+import org.scalatest.{ConfigMap, Matchers, FlatSpec, BeforeAndAfterAllConfigMap}
 import org.eclipse.jetty.server.{Request, Server}
 import org.eclipse.jetty.server.handler.HandlerWrapper
 import org.eclipse.jetty.websocket.WebSocketFactory
 import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
 import java.net.ServerSocket
 
-abstract class BaseTest extends Server with FlatSpec with BeforeAndAfterAll with ShouldMatchers with Logging {
+abstract class BaseTest extends FlatSpec with BeforeAndAfterAllConfigMap with Matchers with LazyLogging {
+  private[this] val server = new Server()
   protected var port1: Int = 0
   private var _connector: SelectChannelConnector = null
 
-  override def beforeAll(configMap: Map[String, Any]) {
+  override def beforeAll(configMap: ConfigMap) {
     setUpGlobal()
   }
 
-  override def afterAll(configMap: Map[String, Any]) {
+  override def afterAll(configMap: ConfigMap) {
     tearDownGlobal()
   }
 
   def setUpGlobal() {
     port1 = findFreePort
     _connector = new SelectChannelConnector
     _connector.setPort(port1)
-    addConnector(_connector)
+    server.addConnector(_connector)
     val _wsHandler: BaseTest#WebSocketHandler = getWebSocketHandler
-    setHandler(_wsHandler)
-    start()
+    server.setHandler(_wsHandler)
+    server.start()
     logger.info("Local HTTP server started successfully")
   }
 
   def tearDownGlobal() {
-    stop()
+    server.stop()
   }
 
   abstract class WebSocketHandler extends HandlerWrapper with WebSocketFactory.Acceptor {

src/test/scala/scalawebsocket/WebSocketSpec.scala

@@ -21,13 +21,13 @@ package scalawebsocket
 
 import java.io.IOException
 import javax.servlet.http.HttpServletRequest
-import com.typesafe.scalalogging.log4j.Logging
+import com.typesafe.scalalogging.LazyLogging
 import java.util.concurrent.{TimeUnit, CountDownLatch}
 import com.ning.http.client.{AsyncHttpClient, websocket}
 import org.scalatest.matchers.{MatchResult, BeMatcher}
 
 
-class WebSocketSpec extends BaseTest with Logging {
+class WebSocketSpec extends BaseTest with LazyLogging {
 
   private final class EchoTextWebSocket extends org.eclipse.jetty.websocket.WebSocket with org.eclipse.jetty.websocket.WebSocket.OnTextMessage with org.eclipse.jetty.websocket.WebSocket.OnBinaryMessage {
     private var connection: org.eclipse.jetty.websocket.WebSocket.Connection = null