Merge pull request #1979 from akka/wip-3855-scala-2.10.3-patriknw

=pro #3855 Update to Scala 2.10.3
This commit is contained in:
Patrik Nordwall 2014-02-03 02:42:59 -08:00
commit dc5b9c65db
2 changed files with 2 additions and 2 deletions

View file

@ -17,7 +17,7 @@
<paxexam.version>2.6.0</paxexam.version>
<paxswissbox.version>1.6.0</paxswissbox.version>
<protobuf.version>2.5.0</protobuf.version>
<scala.version>2.10.2</scala.version>
<scala.version>2.10.3</scala.version>
<scala.dep.version>2.10</scala.dep.version>
<scalatest.version>2.0</scalatest.version>
<typesafe.config.version>1.2.0</typesafe.config.version>

View file

@ -34,7 +34,7 @@ object AkkaBuild extends Build {
val enableMiMa = false
val requestedScalaVersion = System.getProperty("akka.scalaVersion", "2.10.2")
val requestedScalaVersion = System.getProperty("akka.scalaVersion", "2.10.3")
lazy val buildSettings = Seq(
organization := "com.typesafe.akka",