raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

make all tests pass again with 2.10.0-M7

Browse source
This commit is contained in:
Roland 2012-08-22 15:52:32 +02:00
parent 531e3fc5a0
commit d110836629
4 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-docs/scala/code/docs/actor/ActorDocSpec.scala
View file

@ -221,7 +221,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
"creating a Props config" in {
//#creating-props-config
import akka.actor.Props
val props1 = Props()
val props1 = Props.empty
val props2 = Props[MyActor]
val props3 = Props(new MyActor)
val props4 = Props(

2
akka-docs/scala/code/docs/future/FutureDocSpec.scala
View file

@ -108,7 +108,7 @@ class FutureDocSpec extends AkkaSpec {
}
val result = Await.result(f2, 1 second)
result must be(10)
f1.value must be(Some(Right("HelloWorld")))
f1.value must be(Some(Success("HelloWorld")))
//#map
}

2
akka-docs/scala/code/docs/testkit/TestkitDocSpec.scala
View file

@ -217,7 +217,7 @@ class TestkitDocSpec extends AkkaSpec with DefaultTimeout with ImplicitSender {
val future = probe.ref ? "hello"
probe.expectMsg(0 millis, "hello") // TestActor runs on CallingThreadDispatcher
probe.reply("world")
assert(future.isCompleted && future.value == Some(Right("world")))
assert(future.isCompleted && future.value == Some(Success("world")))
//#test-probe-reply
}

14
project/AkkaBuild.scala
View file

@ -24,11 +24,7 @@ object AkkaBuild extends Build {
lazy val buildSettings = Seq(
organization := "com.typesafe.akka",
version := "2.1-SNAPSHOT",
scalaVersion := "2.10.0-SNAPSHOT",
scalaVersion in update <<= (scalaVersion) apply {
case "2.10.0-SNAPSHOT" => "2.10.0-M6"
case x => x
}
scalaVersion := "2.10.0-M7"
)
lazy val akka = Project(
@ -425,6 +421,8 @@ object AkkaBuild extends Build {
scalacOptions in Compile ++= Seq("-encoding", "UTF-8", "-target:jvm-1.6", "-deprecation", "-feature", "-unchecked", "-Xlog-reflective-calls", "-Ywarn-adapted-args"),
javacOptions in Compile ++= Seq("-source", "1.6", "-target", "1.6", "-Xlint:unchecked", "-Xlint:deprecation"),
crossVersion := CrossVersion.full,
ivyLoggingLevel in ThisBuild := UpdateLogging.Quiet,
parallelExecution in Test := System.getProperty("akka.parallelExecution", "false").toBoolean,
@ -585,9 +583,7 @@ object Dependency {
val config = "com.typesafe" % "config" % "0.5.0" // ApacheV2
val netty = "io.netty" % "netty" % "3.5.4.Final" // ApacheV2
val protobuf = "com.google.protobuf" % "protobuf-java" % "2.4.1" // New BSD
// TODO FIXME use live version
// val scalaStm = "org.scala-tools" %% "scala-stm" % "0.6" // Modified BSD (Scala)
val scalaStm = "org.scala-tools" % "scala-stm" % "0.7-SNAPSHOT" // Modified BSD (Scala)
val scalaStm = "org.scala-tools" % "scala-stm" % "0.6" cross CrossVersion.full // Modified BSD (Scala)
val slf4jApi = "org.slf4j" % "slf4j-api" % "1.6.4" // MIT
val zeroMQClient = "org.zeromq" % "zeromq-scala-binding" % "0.0.6" cross CrossVersion.full // ApacheV2
@ -603,7 +599,7 @@ object Dependency {
val junit = "junit" % "junit" % "4.10" % "test" // Common Public License 1.0
val logback = "ch.qos.logback" % "logback-classic" % "1.0.4" % "test" // EPL 1.0 / LGPL 2.1
val mockito = "org.mockito" % "mockito-all" % "1.8.1" % "test" // MIT
val scalatest = "org.scalatest" % "scalatest" % "1.9-2.10.0-M6-B2" % "test" cross CrossVersion.full // ApacheV2
val scalatest = "org.scalatest" % "scalatest" % "1.9-2.10.0-M7-B1" % "test" cross CrossVersion.full // ApacheV2
val scalacheck = "org.scalacheck" % "scalacheck" % "1.10.0" % "test" cross CrossVersion.full // New BSD
val ariesProxy = "org.apache.aries.proxy" % "org.apache.aries.proxy.impl" % "0.3" % "test" // ApacheV2
val pojosr = "com.googlecode.pojosr" % "de.kalpatec.pojosr.framework" % "0.1.4" % "test" // ApacheV2