Add 2.12.0 crossbuild #1

Open
wants to merge 2 commits into
from
Binary file not shown.
@@ -24,17 +24,17 @@ object Dependencies {
)
val sprayVersion = "1.3.3"
- val akkaVersion = "2.3.14"
+ val akkaVersion = "2.4.12"
val aspectjVersion = "1.8.9"
val slf4jVersion = "1.7.7"
val play23Version = "2.3.10"
val play24Version = "2.4.6"
val play25Version = "2.5.4"
val elasticsearchVersion = "2.1.0"
- val sprayJson = "io.spray" %% "spray-json" % "1.3.1"
+ val sprayJson = "io.spray" %% "spray-json" % "1.3.2"
val sprayJsonLenses = "net.virtual-void" %% "json-lenses" % "0.6.0"
- val scalatest = "org.scalatest" %% "scalatest" % "2.2.4"
+ val scalatest = "org.scalatest" %% "scalatest" % "3.0.0"
val logback = "ch.qos.logback" % "logback-classic" % "1.0.13"
val aspectJ = "org.aspectj" % "aspectjweaver" % aspectjVersion
val newrelic = "com.newrelic.agent.java" % "newrelic-agent" % "3.26.1"
@@ -52,7 +52,7 @@ object Dependencies {
val slf4jnop = "org.slf4j" % "slf4j-nop" % slf4jVersion
val slf4jJul = "org.slf4j" % "jul-to-slf4j" % slf4jVersion
val slf4jLog4j = "org.slf4j" % "log4j-over-slf4j" % slf4jVersion
- val scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % "7.1.0"
+ val scalazConcurrent = "org.scalaz" %% "scalaz-concurrent" % "7.2.7"
val twitterUtilCore = "com.twitter" %% "util-core" % "6.34.0"
val sigarLoader = "io.kamon" % "sigar-loader" % "1.6.5-rev002"
val h2 = "com.h2database" % "h2" % "1.4.182"
@@ -25,12 +25,12 @@ import scalariform.formatter.preferences._
object Settings {
val JavaVersion = "1.6"
- val ScalaVersion = "2.11.6"
+ val ScalaVersion = "2.12.0"
lazy val basicSettings = Seq(
ivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true) },
scalaVersion := ScalaVersion,
- crossScalaVersions := Seq("2.10.5", ScalaVersion),
+ crossScalaVersions := Seq("2.10.5", "2.11.6", ScalaVersion),
resolvers ++= Dependencies.resolutionRepos,
fork in run := true,
parallelExecution in Global := false,