Skip to content

Commit

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

[2.0.x] Patch updates
  • Loading branch information
mkurz authored Dec 20, 2024
2 parents 80b4dd8 + b9069b3 commit cae12b1
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ lazy val compiler = project
}
},
libraryDependencies += parserCombinators(scalaVersion.value),
libraryDependencies += ("org.scalameta" %% "parsers" % "4.11.1").cross(CrossVersion.for3Use2_13),
libraryDependencies += ("org.scalameta" %% "parsers" % "4.11.2").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.5
sbt.version=1.10.6
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("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.5"))
addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.6"))
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.5
sbt.version=1.10.6
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>

addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")

// For the Cross Build
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
Expand All @@ -10,6 +10,6 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.5")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.6")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
addSbtPlugin("com.github.sbt" % "sbt-maven-plugin" % "0.0.2")

0 comments on commit cae12b1

Please sign in to comment.