Merge branch 'develop' into nicknezis/kryo-5-upgrade

Author: nicknezis

build.sbt

@@ -1,10 +1,10 @@
 import com.typesafe.tools.mima.plugin.MimaPlugin.mimaDefaultSettings
 
-val akkaVersion = "2.6.10"
+val akkaVersion = "2.6.13"
 val algebirdVersion = "0.13.7"
 val bijectionVersion = "0.9.7"
 val kryoVersion = "5.0.3"
-val scroogeVersion = "20.12.0"
+val scroogeVersion = "21.2.0"
 val asmVersion = "4.15"
 
 def scalaVersionSpecificFolders(srcBaseDir: java.io.File, scalaVersion: String): List[File] =
@@ -38,7 +38,7 @@ val sharedSettings = mimaDefaultSettings ++ Seq(
   ),
   libraryDependencies ++= Seq(
     "org.scalacheck" %% "scalacheck" % "1.15.2" % "test",
-    "org.scalatest" %% "scalatest" % "3.2.3" % "test",
+    "org.scalatest" %% "scalatest" % "3.2.5" % "test",
     "org.scalatestplus" %% "scalatestplus-scalacheck" % "3.1.0.0-RC2" % "test",
     "com.esotericsoftware.kryo" % "kryo5" % kryoVersion
   ),
@@ -259,7 +259,7 @@ lazy val chillAvro = module("avro")
   .settings(
     libraryDependencies ++= Seq(
       "com.twitter" %% "bijection-avro" % bijectionVersion,
-      "junit" % "junit" % "4.13.1" % "test"
+      "junit" % "junit" % "4.13.2" % "test"
     )
   )
   .dependsOn(chill, chillJava, chillBijection)

project/build.properties

@@ -1 +1 @@
-sbt.version=1.4.6
+sbt.version=1.4.7

project/plugins.sbt

@@ -4,5 +4,5 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
 addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.24")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.26")
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.5")