Skip to content

Commit

Permalink
Merge pull request #751 from scala-steward/update/patches
Browse files Browse the repository at this point in the history
Patch updates
  • Loading branch information
mkurz authored Apr 25, 2024
2 parents 5b386d3 + f66b22a commit aea8ce6
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 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.9.0").cross(CrossVersion.for3Use2_13),
libraryDependencies += ("org.scalameta" %% "parsers" % "4.9.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/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ lazy val docs = project
.enablePlugins(PlayDocsPlugin)
.configs(Configuration.of("Docs", "docs"))
.settings(
scalaVersion := "2.13.12",
scalaVersion := "2.13.13",
// use special snapshot play version for now
resolvers ++= DefaultOptions.resolvers(snapshot = true),
libraryDependencies += component("play-test") % "test",
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.9.8
sbt.version=1.9.9
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.1"))
addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.2"))
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
*/

object Dependencies {
val Scala212 = "2.12.18"
val Scala213 = "2.13.12"
val Scala3 = "3.3.1"
val Scala212 = "2.12.19"
val Scala213 = "2.13.13"
val Scala3 = "3.3.3"
val ScalaVersions = Seq(Scala212, Scala213, Scala3)
}
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.9.8
sbt.version=1.9.9
2 changes: 1 addition & 1 deletion sbt-twirl/src/sbt-test/twirl/compile-scala3/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ lazy val root = (project in file("."))
SbtTwirl
}
.settings(
scalaVersion := "3.3.1",
scalaVersion := "3.3.3",
scalacOptions ++= Seq("-source:future", "-feature")
)

0 comments on commit aea8ce6

Please sign in to comment.