Skip to content

Commit

Permalink
Merge pull request playframework#817 from scala-steward/update/1.6.x/…
Browse files Browse the repository at this point in the history
…patches

[1.6.x] Patch updates
  • Loading branch information
mkurz authored Jul 30, 2024
2 parents fb6ce4e + 2412b4e commit 1bbc784
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.2
version = 3.8.3

runner.dialect = scala213

Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ lazy val compiler = project
}
},
libraryDependencies += parserCombinators(scalaVersion.value),
libraryDependencies += ("org.scalameta" %% "parsers" % "4.9.7").cross(CrossVersion.for3Use2_13),
libraryDependencies += ("org.scalameta" %% "parsers" % "4.9.9").cross(CrossVersion.for3Use2_13),
run / fork := true,
buildInfoKeys := Seq[BuildInfoKey](scalaVersion),
buildInfoPackage := "play.twirl.compiler"
Expand Down
2 changes: 1 addition & 1 deletion docs/project/build.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>

sbt.version=1.10.0
sbt.version=1.10.1
2 changes: 1 addition & 1 deletion docs/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ 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.9.4"))
addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.5"))
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>

sbt.version=1.10.0
sbt.version=1.10.1

0 comments on commit 1bbc784

Please sign in to comment.