Upated Scala, Spring, Spring Boot versions; Fixed lifecycle phase initialization order bug

Author: lancearlaus

build.sbt

@@ -1,18 +1,18 @@
 import sbt.Keys._
 
 // Common dependency versions
-val akkaVersion = "2.3.11"
-val springVersion = "4.1.6.RELEASE"
-val springBootVersion = "1.2.4.RELEASE"
+val akkaVersion = "2.4.2"
+val springVersion = "4.2.5.RELEASE"
+val springBootVersion = "1.3.3.RELEASE"
 
 lazy val `akka-spring-boot` = (project in file(".")).
   settings(net.virtualvoid.sbt.graph.Plugin.graphSettings: _*).
   settings(
     organization        := "com.github.scalaspring",
     name                := "akka-spring-boot",
     description         := "Scala-based integration of Akka with Spring Boot.\nTwo-way Akka<->Spring configuration bindings and convention over configuration with sensible automatic defaults get your project running quickly.",
-    scalaVersion        := "2.11.6",
-    crossScalaVersions  := Seq("2.10.5"),
+    scalaVersion        := "2.11.8",
+    crossScalaVersions  := Seq("2.10.6"),
     javacOptions        := Seq("-source", "1.7", "-target", "1.7"),
     scalacOptions       ++= Seq("-feature", "-deprecation"),
     resolvers           += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
@@ -32,8 +32,8 @@ lazy val `akka-spring-boot` = (project in file(".")).
     ).map { _ % "runtime" },
     // Test dependencies
     libraryDependencies ++= Seq(
-      "org.scalatest" %% "scalatest" % "2.2.4",
-      "com.github.scalaspring" %% "scalatest-spring" % "0.2.1",
+      "org.scalatest" %% "scalatest" % "2.2.6",
+      "com.github.scalaspring" %% "scalatest-spring" % "0.3.1-SNAPSHOT",
       "org.springframework" % "spring-test" % springVersion,
       "com.typesafe.akka" %% "akka-testkit" % akkaVersion
     ).map { _ % "test" },

src/main/scala/com/github/scalaspring/akka/ActorSystemLifecycle.scala

@@ -1,6 +1,7 @@
 package com.github.scalaspring.akka
 
 import akka.actor.ActorSystem
+import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.SmartLifecycle
 
 
@@ -10,25 +11,33 @@ object ActorSystemLifecycle {
 
 /**
  * Shuts down the actor system when the application context is stopped.
+ *
+ * The lifecycle phase (default -10) can be adjusted by setting the akka.actorSystem.lifecycle.phase configuration
+ * property. Note that the phase MUST be less than any beans that depend on the actor system to ensure that the
+ * actor system is shut down after any dependent beans.
  */
 class ActorSystemLifecycle(actorSystem: ActorSystem) extends SmartLifecycle with SpringLogging {
 
   override def isAutoStartup: Boolean = true
 
-  override def getPhase: Int = 0
+  @Value("${akka.actorSystem.lifecycle.phase:-10}")
+  protected val phase: Int = -10
+  override def getPhase: Int = phase
 
-  override def isRunning: Boolean = !actorSystem.isTerminated
+  override def isRunning: Boolean = !actorSystem.whenTerminated.isCompleted
 
   // Do nothing since the actor system is already started once created
-  override def start(): Unit = { log.info(s"Starting actor system ${actorSystem.name}")}
+  override def start() = {}
 
   override def stop(callback: Runnable): Unit = {
-    if (!actorSystem.isTerminated) {
-      log.info(s"Shutting down actor system ${actorSystem.name}")
-      actorSystem.registerOnTermination({ log.info(s"Shut down complete for actor system ${actorSystem.name}"); callback.run })
-      actorSystem.shutdown()
-    } else {
+    if (actorSystem.whenTerminated.isCompleted) {
       log.warn(s"Actor system ${actorSystem.name} already terminated")
+      callback.run()
+    } else {
+      log.info(s"Terminating actor system ${actorSystem.name}")
+      actorSystem.registerOnTermination(callback)
+      actorSystem.registerOnTermination { log.info(s"Actor system ${actorSystem.name} terminated") }
+      actorSystem.terminate()
     }
   }
 

version.sbt

@@ -1 +1 @@
-version := "0.2.2-SNAPSHOT"
+version := "0.3.1-SNAPSHOT"