Updating dependencies, Scala 2.12 cross-build

Author: adamw

build.sbt

@@ -2,8 +2,9 @@ import scalariform.formatter.preferences._
 
 lazy val commonSettings = scalariformSettings ++ Seq(
   organization := "com.softwaremill.akka-http-session",
-  version := "0.2.7",
+  version := "0.3.0-SNAPSHOT",
   scalaVersion := "2.11.8",
+  crossScalaVersions := Seq(scalaVersion.value, "2.12.0"),
   scalacOptions ++= Seq("-unchecked", "-deprecation"),
   ScalariformKeys.preferences := ScalariformKeys.preferences.value
     .setPreference(DoubleIndentClassDeclaration, true)
@@ -38,10 +39,10 @@ lazy val commonSettings = scalariformSettings ++ Seq(
   homepage := Some(new java.net.URL("http://softwaremill.com"))
 )
 
-val akkaHttpVersion = "3.0.0-RC1"
-val akkaVersion = "2.4.11"
+val akkaHttpVersion = "10.0.0-RC2"
+val akkaVersion = "2.4.12"
 
-val scalaTest = "org.scalatest" %% "scalatest" % "2.2.6" % "test"
+val scalaTest = "org.scalatest" %% "scalatest" % "3.0.1" % "test"
 
 lazy val rootProject = (project in file("."))
   .settings(commonSettings: _*)
@@ -58,7 +59,7 @@ lazy val core: Project = (project in file("core"))
       "com.typesafe.akka" %% "akka-testkit" % akkaVersion,
       "com.typesafe.akka" %% "akka-http" % akkaHttpVersion,
       "com.typesafe.akka" %% "akka-http-testkit" % akkaHttpVersion % "test",
-      "org.scalacheck" %% "scalacheck" % "1.12.5" % "test",
+      "org.scalacheck" %% "scalacheck" % "1.13.4" % "test",
       scalaTest
     )
   )
@@ -68,7 +69,7 @@ lazy val jwt: Project = (project in file("jwt"))
   .settings(
     name := "jwt",
     libraryDependencies ++= Seq(
-      "org.json4s" %% "json4s-jackson" % "3.3.0",
+      "org.json4s" %% "json4s-jackson" % "3.5.0",
       scalaTest
     )
   ) dependsOn(core)
@@ -78,7 +79,7 @@ lazy val example: Project = (project in file("example"))
   .settings(
     publishArtifact := false,
     libraryDependencies ++= Seq(
-      "com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2",
+      "com.typesafe.scala-logging" %% "scala-logging" % "3.5.0",
       "ch.qos.logback" % "logback-classic" % "1.1.7"
     ))
   .dependsOn(core, jwt)

core/src/test/scala/com/softwaremill/session/CsrfDirectivesTest.scala

@@ -7,9 +7,9 @@ import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import com.softwaremill.session.CsrfDirectives._
 import com.softwaremill.session.CsrfOptions._
-import org.scalatest.{ShouldMatchers, FlatSpec}
+import org.scalatest.{Matchers, FlatSpec}
 
-class CsrfDirectivesTest extends FlatSpec with ScalatestRouteTest with ShouldMatchers {
+class CsrfDirectivesTest extends FlatSpec with ScalatestRouteTest with Matchers {
 
   import TestData._
   val cookieName = sessionConfig.csrfCookieConfig.name

core/src/test/scala/com/softwaremill/session/OneOffSetRefreshableGetTest.scala

@@ -4,9 +4,9 @@ import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import com.softwaremill.session.SessionDirectives._
 import com.softwaremill.session.SessionOptions._
-import org.scalatest.{FlatSpec, ShouldMatchers}
+import org.scalatest.{FlatSpec, Matchers}
 
-class OneOffSetRefreshableGetTest extends FlatSpec with ScalatestRouteTest with ShouldMatchers with MultipleTransportTest {
+class OneOffSetRefreshableGetTest extends FlatSpec with ScalatestRouteTest with Matchers with MultipleTransportTest {
 
   import TestData._
 

core/src/test/scala/com/softwaremill/session/OneOffTest.scala

@@ -6,9 +6,9 @@ import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import com.softwaremill.session.SessionDirectives._
 import com.softwaremill.session.SessionOptions._
-import org.scalatest.{FlatSpec, ShouldMatchers}
+import org.scalatest.{FlatSpec, Matchers}
 
-class OneOffTest extends FlatSpec with ScalatestRouteTest with ShouldMatchers with MultipleTransportTest {
+class OneOffTest extends FlatSpec with ScalatestRouteTest with Matchers with MultipleTransportTest {
 
   import TestData._
 

core/src/test/scala/com/softwaremill/session/RefreshableTest.scala

@@ -5,9 +5,9 @@ import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import com.softwaremill.session.SessionDirectives._
 import com.softwaremill.session.SessionOptions._
-import org.scalatest.{FlatSpec, ShouldMatchers}
+import org.scalatest.{FlatSpec, Matchers}
 
-class RefreshableTest extends FlatSpec with ScalatestRouteTest with ShouldMatchers with MultipleTransportTest {
+class RefreshableTest extends FlatSpec with ScalatestRouteTest with Matchers with MultipleTransportTest {
 
   import TestData._
 

example/src/main/scala/com/softwaremill/example/Example.scala

@@ -10,7 +10,7 @@ import com.softwaremill.session.CsrfDirectives._
 import com.softwaremill.session.CsrfOptions._
 import com.softwaremill.session.SessionDirectives._
 import com.softwaremill.session.SessionOptions._
-import com.typesafe.scalalogging.slf4j.StrictLogging
+import com.typesafe.scalalogging.StrictLogging
 
 import scala.io.StdIn
 import scala.util.Try