Merge branch 'master' into update/monix-execution-3.2.2

sangria-graphql · Dec 14, 2020 · 2c8b00a · 2c8b00a
2 parents 82b2327 + 237622b
commit 2c8b00a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -28,7 +28,7 @@ libraryDependencies ++= Seq(
   "org.sangria-graphql" %% "sangria-streaming-api" % "1.0.1",
   "io.monix" %% "monix-execution" % "3.2.2",
   "io.monix" %% "monix-reactive" % "3.2.2",
-  "org.scalatest" %% "scalatest" % "3.1.4" % Test
+  "org.scalatest" %% "scalatest" % "3.2.3" % Test
 )
 
 git.remoteRepo := "git@github.com:sangria-graphql/sangria-monix.git"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.10
+sbt.version=1.3.13