Merge branch 'master' into update/scala-xml-1.3.0

playframework · Apr 30, 2020 · edac458 · edac458
2 parents 7cfa7e6 + 016f0a8
commit edac458
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/docs/project/build.properties b/docs/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.8
+sbt.version=1.3.10
diff --git a/docs/project/plugins.sbt b/docs/project/plugins.sbt
@@ -5,5 +5,5 @@ lazy val sbtTwirl = ProjectRef(Path.fileProperty("user.dir").getParentFile, "plu
 resolvers ++= DefaultOptions.resolvers(snapshot = true)
 
 addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.8.0"))
-addSbtPlugin("de.heikoseeberger" % "sbt-header"           % "5.4.0")
-addSbtPlugin("org.scalameta"     % "sbt-scalafmt"         % "2.3.2")
+addSbtPlugin("de.heikoseeberger" % "sbt-header"           % "5.6.0")
+addSbtPlugin("org.scalameta"     % "sbt-scalafmt"         % "2.3.4")
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.8
+sbt.version=1.3.10
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -6,7 +6,7 @@ addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.32")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
 
 addSbtPlugin("com.typesafe"      % "sbt-mima-plugin" % "0.7.0")
-addSbtPlugin("de.heikoseeberger" % "sbt-header"      % "5.4.0")
-addSbtPlugin("org.scalameta"     % "sbt-scalafmt"    % "2.3.2")
+addSbtPlugin("de.heikoseeberger" % "sbt-header"      % "5.6.0")
+addSbtPlugin("org.scalameta"     % "sbt-scalafmt"    % "2.3.4")
 
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0")