Merge branch 'master' into update/play-json-2.7.4

tototoshi · Feb 26, 2021 · a8e8e60 · a8e8e60
2 parents a83f282 + 2f20b33
commit a8e8e60
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build.sbt b/build.sbt
@@ -13,7 +13,7 @@ crossScalaVersions := Seq(scalaVersion_2_11, scalaVersion_2_12)
 
 libraryDependencies ++= Seq(
   "com.typesafe.play" %% "play-json" % "2.7.4" % "provided",
-  "org.scalatest" %% "scalatest" % "3.0.1" % "test"
+  "org.scalatest" %% "scalatest" % "3.0.9" % "test"
 )
 
 organization := "com.github.tototoshi"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.4.7
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,3 @@
-addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
+addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.4")
-addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
+addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2-1")