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

Merge pull request #15047 from akka/wip-update-test-dependencies-master-ban

Browse source 
=pro Update test dependencies to Scala 2.11 cross published versions
This commit is contained in:
Björn Antonsson 2014-04-24 09:55:20 +02:00
commit 17ecaaa28c
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-docs/rst/scala/code/docs/persistence/PersistenceDocSpec.scala
View file

@ -84,16 +84,16 @@ trait PersistenceDocSpec {
} }
//#deletion //#deletion
} }
class MyProcessor4 extends Processor { class MyProcessor4 extends Processor {
//#recovery-completed //#recovery-completed
override def preStart(): Unit = { override def preStart(): Unit = {
super.preStart() super.preStart()
self ! "FIRST" self ! "FIRST"
} }
def receive = initializing.orElse(active) def receive = initializing.orElse(active)
def initializing: Receive = { def initializing: Receive = {
case "FIRST" => case "FIRST" =>
recoveryCompleted() recoveryCompleted()
@ -102,7 +102,7 @@ trait PersistenceDocSpec {
case other if recoveryFinished => case other if recoveryFinished =>
stash() stash()
} }
def recoveryCompleted(): Unit = { def recoveryCompleted(): Unit = {
// perform init after recovery, before any other messages // perform init after recovery, before any other messages
// ... // ...

6
project/AkkaBuild.scala
View file

@ -1001,9 +1001,9 @@ object Dependencies {
val scalaStmVersion = System.getProperty("akka.build.scalaStmVersion", "0.7") val scalaStmVersion = System.getProperty("akka.build.scalaStmVersion", "0.7")
val scalaZeroMQVersion = System.getProperty("akka.build.scalaZeroMQVersion", "0.0.7") val scalaZeroMQVersion = System.getProperty("akka.build.scalaZeroMQVersion", "0.0.7")
val genJavaDocVersion = System.getProperty("akka.build.genJavaDocVersion", "0.7") val genJavaDocVersion = System.getProperty("akka.build.genJavaDocVersion", "0.7")
val scalaTestVersion = System.getProperty("akka.build.scalaTestVersion", "2.0") val scalaTestVersion = System.getProperty("akka.build.scalaTestVersion", "2.1.3")
val scalaCheckVersion = System.getProperty("akka.build.scalaCheckVersion", "1.10.1") val scalaCheckVersion = System.getProperty("akka.build.scalaCheckVersion", "1.11.3")
val scalaContinuationsVersion = System.getProperty("akka.build.scalaContinuationsVersion", "1.0.0-RC3") val scalaContinuationsVersion = System.getProperty("akka.build.scalaContinuationsVersion", "1.0.1")
} }
object Compile { object Compile {