Fix docs and remove deprecation warnings for Akka 2.4

Author: Reinier Lamers

README.md

@@ -42,7 +42,8 @@ libraryDependencies += "com.thenewmotion.akka" %% "akka-rabbitmq" % "1.2.4"
 <dependency>
     <groupId>com.thenewmotion.akka</groupId>
     <artifactId>akka-rabbitmq_{2.10/2.11}</artifactId>
-    <version>1.2.4</version>
+    <!-- use version 2.0 for Akka 2.4.x, or 1.2.7 for Akka 2.3.x -->
+    <version>2.0</version>
 </dependency>
 ```
 

build.sbt

@@ -1,8 +1,12 @@
+import tnm.ScalaVersion
+
 organization := "com.thenewmotion.akka"
 name := "akka-rabbitmq"
 
 enablePlugins(OssLibPlugin)
 
+crossScalaVersions := Seq(ScalaVersion.curr)
+
 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"))
 

src/main/scala/com/thenewmotion/akka/rabbitmq/examples/ConfirmsExample.scala

@@ -6,7 +6,7 @@ import akka.pattern.ask
 import akka.util.Timeout
 import com.rabbitmq.client.{ MessageProperties, ConfirmListener }
 import scala.collection.mutable
-import scala.concurrent.ExecutionContext
+import scala.concurrent.{ Await, ExecutionContext }
 import scala.concurrent.duration._
 
 /**
@@ -100,8 +100,7 @@ object ConfirmsExample extends App {
   /* --- Letting the app run --- */
 
   Thread.sleep(7000)
-  system.shutdown()
-  system.awaitTermination()
+  Await.result(system.terminate(), 1.second)
 
   System.out.println(s"Unconfirmed messages: ${unconfirmed.mkString(", ")}")
 }

src/main/scala/com/thenewmotion/akka/rabbitmq/examples/TutorialInComparisons.scala

@@ -2,6 +2,8 @@ package com.thenewmotion.akka.rabbitmq
 package examples
 
 import akka.actor.{ Actor, ActorRef, Props, ActorSystem }
+import scala.concurrent.Await
+import scala.concurrent.duration._
 
 /**
  * @author Yaroslav Klymko
@@ -74,9 +76,9 @@ class TutorialInComparisons(implicit system: ActorSystem) {
     channel.close()
   }
 
-  {
+  Await.result({
     system stop channelActor
     system stop connectionActor // will close all channels associated with this connections
-    system.shutdown()
-  }
+    system.terminate()
+  }, 5.seconds)
 }