Skip to content

Commit

Permalink
Merge pull request playframework#859 from playframework/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 Nov 12, 2024
2 parents 38bd591 + bfcd69e commit 77658e2
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ lazy val mavenPlugin = project
.dependsOn(parser / publishM2)
.dependsOn(apiJvm / publishM2)
.value,
libraryDependencies += "org.codehaus.plexus" % "plexus-utils" % "4.0.1",
libraryDependencies += "org.codehaus.plexus" % "plexus-utils" % "4.0.2",
Compile / headerSources ++= (baseDirectory.value / "src" / "maven-test" ** ("*.java" || "*.scala" || "*.scala.html") --- (baseDirectory.value ** "target" ** "*")).get,
mimaFailOnNoPrevious := false,
)
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.14",
scalaVersion := "2.13.15",
// 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.10.1
sbt.version=1.10.5
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

object Dependencies {
val Scala212 = "2.12.20"
val Scala213 = "2.13.14"
val Scala3 = "3.3.3"
val Scala213 = "2.13.15"
val Scala3 = "3.3.4"
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.10.1
sbt.version=1.10.5
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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.0")
addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.5")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
addSbtPlugin("com.github.sbt" % "sbt-maven-plugin" % "0.0.2")
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.3",
scalaVersion := "3.3.4",
scalacOptions ++= Seq("-source:future", "-feature")
)

0 comments on commit 77658e2

Please sign in to comment.