Final cleanup before release

Author: Maxim Fedorov

build.sbt

@@ -6,14 +6,8 @@ enablePlugins(OssLibPlugin)
 licenses := Seq(("Apache License, Version 2.0", url("http://www.apache.org/licenses/LICENSE-2.0")))
 homepage := Some(new URL("https://github.com/thenewmotion/akka-rabbitmq"))
 
-javaVersion := "1.7"
-
 def akka(scalaVersion: String) = {
-  val version = scalaVersion match {
-    case x if x.startsWith("2.11") => "2.4.9"
-    case x if x.startsWith("2.10") => "2.3.15"
-    case other => throw new Exception(s"Unsupported scala version $other")
-  }
+  val version = "2.4.14"
 
   def libs(xs: String*) = xs.map(x => "com.typesafe.akka" %% s"akka-$x" % version)
 
@@ -23,9 +17,9 @@ def akka(scalaVersion: String) = {
 libraryDependencies ++= {
   akka(scalaVersion.value) ++
   Seq(
-    "com.rabbitmq" % "amqp-client" % "3.6.5",
-    "com.typesafe" % "config" % "1.3.0" % "test",
-    "org.specs2" %% "specs2-mock" % "3.8.4" % "test"
+    "com.rabbitmq" % "amqp-client" % "4.0.0",
+    "com.typesafe" % "config" % "1.3.1" % "test",
+    "org.specs2" %% "specs2-mock" % "3.8.6" % "test"
   )
 }
 

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.12
+sbt.version=0.13.13

project/plugins.sbt

@@ -1,6 +1,6 @@
 resolvers += "TNM" at "http://nexus.thenewmotion.com/content/groups/public"
 
-addSbtPlugin("com.thenewmotion" % "sbt-build-seed" % "1.8.1")
+addSbtPlugin("com.thenewmotion" % "sbt-build-seed" % "2.1.0")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")
 

src/main/scala/com/thenewmotion/akka/rabbitmq/RabbitMqActor.scala

@@ -37,4 +37,4 @@ sealed trait ShutdownSignal
 case class AmqpShutdownSignal(cause: ShutdownSignalException) extends ShutdownSignal {
   def appliesTo(x: AnyRef) = cause.getReference eq x
 }
-case object ParentShutdownSignal extends ShutdownSignal
+case object ParentShutdownSignal extends ShutdownSignal

src/test/scala-2.10/com/thenewmotion/akka/rabbitmq/examples/ActorSystemTerminator.scala

@@ -14,7 +14,7 @@ import scala.concurrent.duration._
  * successfully delivered to RabbitMQ. See https://www.rabbitmq.com/confirms.html for more information on publisher
  * confirms.
  */
-object ConfirmsExample extends App with ActorSystemTerminator {
+object ConfirmsExample extends App {
 
   /* --- Some things shared by publisher and consumer --- */
 
@@ -100,7 +100,7 @@ object ConfirmsExample extends App with ActorSystemTerminator {
   /* --- Letting the app run --- */
 
   Thread.sleep(7000)
-  Await.result(terminateActorSystem(system), 1.second)
+  Await.result(system.terminate(), 1.second)
 
   System.out.println(s"Unconfirmed messages: ${unconfirmed.mkString(", ")}")
 }

src/test/scala-2.11/com/thenewmotion/akka/rabbitmq/examples/ActorSystemTerminator.scala

@@ -8,7 +8,7 @@ import scala.concurrent.duration._
 /**
  * @author Yaroslav Klymko
  */
-class TutorialInComparisons(implicit system: ActorSystem) extends ActorSystemTerminator {
+class TutorialInComparisons(implicit system: ActorSystem) {
 
   val connection = {
     val factory = new ConnectionFactory()
@@ -79,6 +79,6 @@ class TutorialInComparisons(implicit system: ActorSystem) extends ActorSystemTer
   Await.result({
     system stop channelActor
     system stop connectionActor // will close all channels associated with this connections
-    terminateActorSystem(system)
+    system.terminate()
   }, 5.seconds)
 }