Merge remote-tracking branch 'origin/master' into update/scala-library-2.12.16

# Conflicts:
#	build.sbt

Author: mkrzemien

.mergify.yml

@@ -6,7 +6,9 @@ pull_request_rules:
   - name: automatic merge for softwaremill-ci pull requests affecting build.sbt
     conditions:
       - author=softwaremill-ci
-      - check-success=ci
+      - check-success=ci (8)
+      - check-success=ci (11)
+      - check-success=ci (17)
       - "#files=1"
       - files=build.sbt
     actions:
@@ -15,7 +17,9 @@ pull_request_rules:
   - name: automatic merge for softwaremill-ci pull requests affecting project plugins.sbt
     conditions:
       - author=softwaremill-ci
-      - check-success=ci
+      - check-success=ci (8)
+      - check-success=ci (11)
+      - check-success=ci (17)
       - "#files=1"
       - files=project/plugins.sbt
     actions:
@@ -24,15 +28,19 @@ pull_request_rules:
   - name: semi-automatic merge for softwaremill-ci pull requests
     conditions:
       - author=softwaremill-ci
-      - check-success=ci
+      - check-success=ci (8)
+      - check-success=ci (11)
+      - check-success=ci (17)
       - "#approved-reviews-by>=1"
     actions:
       merge:
         method: merge
   - name: automatic merge for softwaremill-ci pull requests affecting project build.properties
     conditions:
       - author=softwaremill-ci
-      - check-success=ci
+      - check-success=ci (8)
+      - check-success=ci (11)
+      - check-success=ci (17)
       - "#files=1"
       - files=project/build.properties
     actions:
@@ -41,7 +49,9 @@ pull_request_rules:
   - name: automatic merge for softwaremill-ci pull requests affecting .scalafmt.conf
     conditions:
       - author=softwaremill-ci
-      - check-success=ci
+      - check-success=ci (8)
+      - check-success=ci (11)
+      - check-success=ci (17)
       - "#files=1"
       - files=.scalafmt.conf
     actions:

build.sbt

@@ -8,10 +8,10 @@ import sbt.Keys._
 excludeLintKeys in Global ++= Set(ideSkipProject)
 
 val scala2_12 = "2.12.16"
-val scala2_13 = "2.13.6"
+val scala2_13 = "2.13.8"
 
 val scala2 = List(scala2_12, scala2_13)
-val scala3 = "3.0.1"
+val scala3 = "3.0.2"
 
 val scala2And3Versions = scala2 :+ scala3
 
@@ -64,10 +64,10 @@ val testSettings = commonSettings ++ Seq(
 val tagging = "com.softwaremill.common" %% "tagging" % "2.3.1"
 val scalatest = "org.scalatest" %% "scalatest" % "3.2.9"
 val javassist = "org.javassist" % "javassist" % "3.28.0-GA"
-val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.6.15"
+val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.6.19"
 val javaxInject = "javax.inject" % "javax.inject" % "1"
 val cats = "org.typelevel" %% "cats-core" % "2.6.1"
-val catsEffect = "org.typelevel" %% "cats-effect" % "3.2.1"
+val catsEffect = "org.typelevel" %% "cats-effect" % "3.2.9"
 
 lazy val root = project
   .in(file("."))

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.4
+sbt.version=1.5.8

project/plugins.sbt

@@ -6,4 +6,4 @@ addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" %
 
 addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.0")