From 53dff66fb774982400916e4233f54d7a5c36f963 Mon Sep 17 00:00:00 2001 From: Gilad Hoch Date: Tue, 18 Nov 2014 09:17:51 +0200 Subject: [PATCH 1/2] upgraded to scala 2.11.4 --- project/Build.scala | 12 +++++------ project/build.properties | 2 +- project/project/SWSPlugins.scala | 4 ++-- src/main/scala/scalawebsocket/WebSocket.scala | 4 ++-- src/test/scala/scalawebsocket/BaseTest.scala | 20 +++++++++---------- .../scala/scalawebsocket/WebSocketSpec.scala | 4 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index b1eb5dc..92dd4e9 100644 --- a/project/Build.scala +++ b/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) -} \ No newline at end of file +} diff --git a/project/build.properties b/project/build.properties index db255c2..64abd37 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.12.3 \ No newline at end of file +sbt.version=0.13.6 diff --git a/project/project/SWSPlugins.scala b/project/project/SWSPlugins.scala index 403551e..c46875e 100644 --- a/project/project/SWSPlugins.scala +++ b/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")) -} \ No newline at end of file +} diff --git a/src/main/scala/scalawebsocket/WebSocket.scala b/src/main/scala/scalawebsocket/WebSocket.scala index 4380e71..8e259be 100644 --- a/src/main/scala/scalawebsocket/WebSocket.scala +++ b/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 diff --git a/src/test/scala/scalawebsocket/BaseTest.scala b/src/test/scala/scalawebsocket/BaseTest.scala index 305ad38..8779709 100644 --- a/src/test/scala/scalawebsocket/BaseTest.scala +++ b/src/test/scala/scalawebsocket/BaseTest.scala @@ -17,24 +17,24 @@ 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() } @@ -42,15 +42,15 @@ abstract class BaseTest extends Server with FlatSpec with BeforeAndAfterAll with 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 { diff --git a/src/test/scala/scalawebsocket/WebSocketSpec.scala b/src/test/scala/scalawebsocket/WebSocketSpec.scala index 67bc556..5fec157 100644 --- a/src/test/scala/scalawebsocket/WebSocketSpec.scala +++ b/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 From e367f9f4e3ebf50b23f734012821558fe7f97a05 Mon Sep 17 00:00:00 2001 From: Gilad Hoch Date: Tue, 18 Nov 2014 09:32:23 +0200 Subject: [PATCH 2/2] added publish.sbt to .gitignore --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0ee4bf4..82b51b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ target/ .idea/ -.idea_modules/ \ No newline at end of file +.idea_modules/ +publish.sbt +