Merge branch 'develop' into hotfix/combine-stream-completion-result

bitrockteam · Jun 1, 2020 · 8271611 · 8271611
2 parents 3f4a9f0 + 5b2860c
commit 8271611
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -10,7 +10,7 @@ object Dependencies {
 
   object Versions {
     lazy val Scala               = "2.12.10"
-    lazy val Akka                = "2.6.3"
+    lazy val Akka                = "2.6.4"
     lazy val AkkaHttp            = "10.1.11"
     lazy val Alpakka             = "2.0.2"
     lazy val ConfluentPlatform   = "5.4.0"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.8
+sbt.version=1.3.9
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
-addSbtPlugin("com.typesafe.sbt"          % "sbt-native-packager" % "1.6.1")
+addSbtPlugin("com.typesafe.sbt"          % "sbt-native-packager" % "1.6.2")
 addSbtPlugin("com.github.gseitz"         % "sbt-release"         % "1.0.13")
 addSbtPlugin("org.scalameta"             % "sbt-scalafmt"        % "2.3.2")
-addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix"        % "0.9.11")
+addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix"        % "0.9.13")
 addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"        % "0.1.11")