Update Akka to 2.6 and drop Scala 2.11 support (ShellRechargeSolution…

…sEU#62)

* Update Akka to 2.6 and drop Scala 2.11 support

* Update sbt to 1.4.0

README.md

@@ -24,9 +24,9 @@ using confirms can be found in this project under [ConfirmsExample.scala](https:
 ## Setup
 
 ### Sbt
-Since version `3.0.0`
+Since version `3.0.0`:
 ``` scala
-libraryDependencies += "com.newmotion" %% "akka-rabbitmq" % "5.0.4-beta"
+libraryDependencies += "com.newmotion" %% "akka-rabbitmq" % "6.0.0"
 ```
 
 To add earlier releases as a dependency, you have to add the NewMotion public repository to your resolver list:
@@ -36,11 +36,20 @@ libraryDependencies += "com.thenewmotion.akka" %% "akka-rabbitmq" % "2.3"
 ```
 
 ### Maven
+Since version `6.0.0`
+```xml
+<dependency>
+    <groupId>com.newmotion</groupId>
+    <artifactId>akka-rabbitmq_{2.12/2.13}</artifactId>
+    <version>6.0.0</version>
+</dependency>
+```
+
 Since version `4.0.0`
 ```xml
 <dependency>
     <groupId>com.newmotion</groupId>
-    <artifactId>akka-rabbitmq_{2.11/2.12}</artifactId>
+    <artifactId>akka-rabbitmq_{2.12/2.13}</artifactId>
     <version>5.0.4-beta</version>
 </dependency>
 ```
@@ -241,6 +250,13 @@ object PublishSubscribe extends App {
 
 ## Changelog
 
+### 6.0.0
+ * Drop support of Scala 2.11
+ * Update dependencies:
+
+    * amqp-client: 5.7.3 -> 5.9.0
+    * akka: 2.5.+ -> 2.6.+
+
 ### 5.1.2
 
  * Update to latest dependencies:

build.sbt

@@ -3,29 +3,24 @@ name := "akka-rabbitmq"
 
 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/NewMotion/akka-rabbitmq"))
-
-scalaVersion := tnm.ScalaVersion.prev
+licenses := Seq(
+  ("Apache License, Version 2.0",
+   url("http://www.apache.org/licenses/LICENSE-2.0")))
 
-crossScalaVersions := Seq(tnm.ScalaVersion.aged, tnm.ScalaVersion.curr, tnm.ScalaVersion.prev)
+homepage := Some(new URL("https://github.com/NewMotion/akka-rabbitmq"))
 
-def akka(scalaVersion: String) = {
-  val version = "2.5.+"
+scalaVersion := tnm.ScalaVersion.curr
 
-  def libs(xs: String*) = xs.map(x => "com.typesafe.akka" %% s"akka-$x" % version)
+crossScalaVersions := Seq(tnm.ScalaVersion.curr, tnm.ScalaVersion.prev)
 
-  libs("actor").map(_ % "provided") ++ libs("testkit").map(_ % "test")
-}
+def akka(name: String): ModuleID = "com.typesafe.akka" %% s"akka-$name" % "2.6.+"
 
-libraryDependencies ++= {
-  akka(scalaVersion.value) ++
-  Seq(
-    "com.rabbitmq" % "amqp-client" % "5.9.0",
-    "com.typesafe" % "config" % "1.4.0" % "test",
-    "org.specs2" %% "specs2-mock" % "4.8.1" % "test"
-  )
-}
+libraryDependencies ++= Seq(
+  "com.rabbitmq" % "amqp-client" % "5.9.0",
+  akka("actor") % "provided",
+  akka("testkit") % "test",
+  "com.typesafe" % "config" % "1.4.0" % "test",
+  "org.specs2" %% "specs2-mock" % "4.10.3" % "test"
+)
 
 Format.settings
-

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.4
+sbt.version=1.4.0

project/plugins.sbt

@@ -1,9 +1,9 @@
 resolvers += "NewMotion" at "https://nexus.thenewmotion.com/content/groups/public"
 
-addSbtPlugin("com.newmotion" % "sbt-build-seed" % "5.0.4")
+addSbtPlugin("com.newmotion" % "sbt-build-seed" % "5.1.0")
 
 addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.4")
 
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.1")

version.sbt

@@ -1 +1 @@
-version in ThisBuild := "5.1.3-SNAPSHOT"
+version in ThisBuild := "6.0.0-SNAPSHOT"