Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into scala-steward-updat…
Browse files Browse the repository at this point in the history
…e/scala-compiler-2.13.12

# Conflicts:
#	project/Commons.scala
#	project/plugins.sbt
  • Loading branch information
sebaciv committed Oct 11, 2023
2 parents a4854c5 + 1778a7d commit 8bcf823
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion project/Commons.scala
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ object Commons extends ProjectGroup("commons") {
val scalatestVersion = "3.2.17"
val scalatestplusScalacheckVersion = "3.2.14.0"
val scalacheckVersion = "1.17.0"
val jettyVersion = "10.0.16"
val jettyVersion = "10.0.17"
val mongoVersion = "4.10.2"
val springVersion = "5.3.30"
val typesafeConfigVersion = "1.4.2"
Expand Down
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
logLevel := Level.Warn

addSbtPlugin("com.github.ghik" % "sbt-nosbt" % "0.2.1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.14.0")
addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.16.0")
addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.17.0")
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ trait RedisMonixApi extends RedisExecutedApi {
type Result[A] = Task[A]

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

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

0 comments on commit 8bcf823

Please sign in to comment.