Skip to content

Commit 8bcf823

Browse files
committed
Merge remote-tracking branch 'origin/master' into scala-steward-update/scala-compiler-2.13.12
# Conflicts: # project/Commons.scala # project/plugins.sbt
2 parents a4854c5 + 1778a7d commit 8bcf823

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

project/Commons.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ object Commons extends ProjectGroup("commons") {
2929
val scalatestVersion = "3.2.17"
3030
val scalatestplusScalacheckVersion = "3.2.14.0"
3131
val scalacheckVersion = "1.17.0"
32-
val jettyVersion = "10.0.16"
32+
val jettyVersion = "10.0.17"
3333
val mongoVersion = "4.10.2"
3434
val springVersion = "5.3.30"
3535
val typesafeConfigVersion = "1.4.2"

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
logLevel := Level.Warn
22

33
addSbtPlugin("com.github.ghik" % "sbt-nosbt" % "0.2.1")
4-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
4+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
55
addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
66
addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")
77
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
88
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
99
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
10-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2")
10+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
1111
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
12-
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.16.0")
12+
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.17.0")

redis/src/main/scala/com/avsystem/commons/redis/ApiSubset.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ trait RedisMonixApi extends RedisExecutedApi {
160160
type Result[A] = Task[A]
161161

162162
def execute[A](command: RedisCommand[A]): Task[A] = Task.deferFutureAction { scheduler =>
163-
executor.executeBatch(command, execConfig.copy(decodeOn = scheduler))
163+
executor.executeBatch(command.batchOrFallback, execConfig.copy(decodeOn = scheduler))
164164
}
165165

166166
def recoverWith[A](executed: => Task[A])(fun: PartialFunction[Throwable, Task[A]]): Task[A] =

0 commit comments

Comments
 (0)