Merge pull request #80 from MAIF/issue-78

Libs upgrades
MAIF · Mar 16, 2018 · faacba2 · faacba2
2 parents 1e38d9a + 7347648
commit faacba2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/izanami-clients/jvm/build.sbt b/izanami-clients/jvm/build.sbt
@@ -1,7 +1,7 @@
 import sbt.Keys.{organization, scalacOptions}
 import sbtrelease.ReleaseStateTransformations._
 
-val akkaVersion = "2.5.9"
+val akkaVersion = "2.5.11"
 
 val disabledPlugins = if (sys.env.get("TRAVIS_TAG").filterNot(_.isEmpty).isDefined) {
   Seq(RevolverPlugin)
@@ -19,7 +19,7 @@ lazy val jvm = (project in file("."))
     libraryDependencies ++= Seq(
       "com.typesafe.akka"          %% "akka-stream"             % akkaVersion,
       "com.typesafe.akka"          %% "akka-slf4j"              % akkaVersion,
-      "com.typesafe.akka"          %% "akka-http"               % "10.0.11",
+      "com.typesafe.akka"          %% "akka-http"               % "10.1.0",
       "com.lightbend.akka"         %% "akka-stream-alpakka-sse" % "0.17",
       "io.vavr"                    % "vavr"                     % "0.9.2",
       "org.reactivecouchbase.json" % "json-lib"                 % "1.0.0",

diff --git a/izanami-server/build.sbt b/izanami-server/build.sbt
@@ -13,7 +13,7 @@ lazy val `izanami-server` = (project in file("."))
 
 scalaVersion := "2.12.4"
 
-val akkaVersion = "2.5.8"
+val akkaVersion = "2.5.11"
 
 resolvers ++= Seq(
   Resolver.jcenterRepo
@@ -27,16 +27,17 @@ libraryDependencies ++= Seq(
   "com.softwaremill.macwire" %% "macros"                        % "2.3.0" % "provided", // Apache 2.0
   "com.typesafe.akka"        %% "akka-actor"                    % akkaVersion, // Apache 2.0
   "com.typesafe.akka"        %% "akka-stream"                   % akkaVersion, // Apache 2.0
-  "com.typesafe.akka"        %% "akka-typed"                    % akkaVersion, // Apache 2.0
+  "com.typesafe.akka"        %% "akka-actor-typed"              % akkaVersion, // Apache 2.0
   "com.typesafe.akka"        %% "akka-cluster"                  % akkaVersion, // Apache 2.0
   "com.typesafe.akka"        %% "akka-cluster-tools"            % akkaVersion, // Apache 2.0
+  "com.typesafe.akka"        %% "akka-testkit"                  % akkaVersion, // Apache 2.0
   "com.github.etaty"         %% "rediscala"                     % "1.8.0", // Apache 2.0
   "org.iq80.leveldb"         % "leveldb"                        % "0.10", // Apache 2.0
   "org.typelevel"            %% "cats-core"                     % "1.0.1", // MIT license
   "com.chuusai"              %% "shapeless"                     % "2.3.2", // Apache 2.0
   "com.adelegue"             %% "playjson-extended"             % "0.0.3", // Apache 2.0
   "com.github.pureconfig"    %% "pureconfig"                    % "0.8.0", // Apache 2.0
-  "com.lightbend.akka"       %% "akka-stream-alpakka-cassandra" % "0.12", // Apache 2.0
+  "com.lightbend.akka"       %% "akka-stream-alpakka-cassandra" % "0.17", // Apache 2.0
   "com.typesafe.akka"        %% "akka-stream-kafka"             % "0.18", // Apache 2.0
   "com.adelegue"             %% "elastic-scala-http"            % "0.0.11", // Apache 2.0
   "com.datastax.cassandra"   % "cassandra-driver-core"          % "3.3.0", // Apache 2.0

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,6 +1,6 @@
 
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.11") // Apache 2.0
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.12") // Apache 2.0
 
 addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.12") // Apache 2.0