Release 0.11.0: updating dependencies, cross-building for 2.12

softwaremill · Nov 23, 2016 · 381b928 · 381b928
1 parent aeaf151
commit 381b928
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 123 deletions.
diff --git a/README.md b/README.md
@@ -284,6 +284,10 @@ Technology
 Change log
 ----------
 
+#### Version 0.11.0 (23 Nov 2016)
+
+* updating dependencies, using Akka HTTP 10, builds for Scala 2.11 and 2.12
+
 #### Version 0.10.1 (31 Oct 2016)
 
 * fixing a bug with changing message visibility and long pooling

diff --git a/core/src/test/scala/org/elasticmq/DeliveryReceiptTest.scala b/core/src/test/scala/org/elasticmq/DeliveryReceiptTest.scala
@@ -1,9 +1,9 @@
 package org.elasticmq
 
-import org.scalatest.matchers.MustMatchers
+import org.scalatest.Matchers
 import org.scalatest.FunSuite
 
-class DeliveryReceiptTest extends FunSuite with MustMatchers {
+class DeliveryReceiptTest extends FunSuite with Matchers {
   test("should extract id") {
     // Given
     val id = MessageId("123-781-abc-def")
@@ -12,6 +12,6 @@ class DeliveryReceiptTest extends FunSuite with MustMatchers {
     val receipt = DeliveryReceipt.generate(id)
 
     // Then
-    receipt.extractId must be (id)
+    receipt.extractId should be (id)
   }
 }
diff --git a/core/src/test/scala/org/elasticmq/actor/test/ActorTest.scala b/core/src/test/scala/org/elasticmq/actor/test/ActorTest.scala
@@ -3,12 +3,12 @@ package org.elasticmq.actor.test
 import akka.testkit.TestKit
 import akka.actor.ActorSystem
 import org.scalatest.{FunSuiteLike, BeforeAndAfterAll}
-import org.scalatest.matchers.ShouldMatchers
+import org.scalatest.Matchers
 import akka.util.Timeout
 import scala.concurrent.duration._
 import scala.concurrent.{Await, Future}
 
-abstract class ActorTest extends TestKit(ActorSystem()) with FunSuiteLike with ShouldMatchers with BeforeAndAfterAll {
+abstract class ActorTest extends TestKit(ActorSystem()) with FunSuiteLike with Matchers with BeforeAndAfterAll {
   private val maxDuration = 1.minute
   implicit val timeout: Timeout = maxDuration
   implicit val ec = system.dispatcher

diff --git a/project/Build.scala b/project/Build.scala
@@ -6,8 +6,9 @@ import AssemblyKeys._
 object BuildSettings {
   val buildSettings = Defaults.coreDefaultSettings ++ Seq (
     organization  := "org.elasticmq",
-    version       := "0.10.1",
+    version       := "0.11.0",
     scalaVersion  := "2.11.8",
+    crossScalaVersions := Seq(scalaVersion.value, "2.12.0"),
 
     libraryDependencies += "org.scala-lang.modules" %% "scala-xml" % "1.0.6",
 
@@ -42,25 +43,26 @@ object BuildSettings {
 }
 
 object Dependencies {
-  val jodaTime      = "joda-time"                 % "joda-time"             % "2.9.4"
+  val jodaTime      = "joda-time"                 % "joda-time"             % "2.9.6"
   val jodaConvert   = "org.joda"                  % "joda-convert"          % "1.8.1"
-  val config        = "com.typesafe"              % "config"                % "1.3.0"
+  val config        = "com.typesafe"              % "config"                % "1.3.1"
 
   val scalalogging  = "com.typesafe.scala-logging" %% "scala-logging"       % "3.5.0"
   val logback       = "ch.qos.logback"            % "logback-classic"       % "1.1.7"
   val jclOverSlf4j  = "org.slf4j"                 % "jcl-over-slf4j"        % "1.7.21" // needed form amazon java sdk
 
-  val scalatest     = "org.scalatest"             %% "scalatest"            % "2.2.6"
+  val scalatest     = "org.scalatest"             %% "scalatest"            % "3.0.1"
   val awaitility    = "com.jayway.awaitility"     % "awaitility-scala"      % "1.7.0"
 
-  val amazonJavaSdk = "com.amazonaws"             % "aws-java-sdk"          % "1.11.25" exclude ("commons-logging", "commons-logging")
+  val amazonJavaSdk = "com.amazonaws"             % "aws-java-sdk"          % "1.11.59" exclude ("commons-logging", "commons-logging")
 
-  val akka2Version  = "2.4.11"
-  val akka2Actor    = "com.typesafe.akka" %% "akka-actor"           % akka2Version
-  val akka2Slf4j    = "com.typesafe.akka" %% "akka-slf4j"           % akka2Version
-  val akka2Testkit  = "com.typesafe.akka" %% "akka-testkit"         % akka2Version % "test"
-  val akka2Http     = "com.typesafe.akka" %% "akka-http-experimental" % akka2Version
-  val akka2HttpTestkit = "com.typesafe.akka" %% "akka-http-testkit" % akka2Version % "test"
+  val akkaVersion  = "2.4.14"
+  val akkaHttpVersion = "10.0.0"
+  val akka2Actor    = "com.typesafe.akka" %% "akka-actor"           % akkaVersion
+  val akka2Slf4j    = "com.typesafe.akka" %% "akka-slf4j"           % akkaVersion
+  val akka2Testkit  = "com.typesafe.akka" %% "akka-testkit"         % akkaVersion % "test"
+  val akka2Http     = "com.typesafe.akka" %% "akka-http"            % akkaHttpVersion
+  val akka2HttpTestkit = "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "test"
 
   val scalaAsync    = "org.scala-lang.modules" %% "scala-async" % "0.9.6"
 

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=0.13.13