Skip to content

Commit

Permalink
Merge pull request #515 from scala-steward/update/7.x/patches
Browse files Browse the repository at this point in the history
[7.x] Patch updates
  • Loading branch information
mkurz authored Feb 10, 2025
2 parents 2e3c96d + 15f0710 commit d333732
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
uses: playframework/.github/.github/workflows/cmd.yml@v3
with:
java: 17, 11
scala: 2.13.15, 3.3.3
scala: 2.13.16, 3.3.3
cmd: >-
sbt "
+publishLocal;
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in im
trailingCommas = preserve
newlines.afterCurlyLambda = preserve
runner.dialect = scala212source3
version = 3.8.3
version = 3.8.6
2 changes: 1 addition & 1 deletion docs/.scalafmt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in im
trailingCommas = preserve
newlines.afterCurlyLambda = preserve
runner.dialect = scala212source3
version = 3.8.3
version = 3.8.6
4 changes: 2 additions & 2 deletions docs/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ lazy val docs = project
// No resource directories shuts the ebean agent up about java sources in the classes directory
Test / unmanagedResourceDirectories := Nil,
Test / parallelExecution := false,
scalaVersion := "2.13.15",
crossScalaVersions := Seq("2.13.15", "3.3.3"),
scalaVersion := "2.13.16",
crossScalaVersions := Seq("2.13.16", "3.3.3"),
)
.settings(
Test / javafmt / sourceDirectories ++= (Test / unmanagedSourceDirectories).value,
Expand Down
2 changes: 1 addition & 1 deletion docs/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse(

addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")

addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ object Dependencies {

object ScalaVersions {
val scala212 = "2.12.20"
val scala213 = "2.13.15"
val scala3 = "3.3.4"
val scala213 = "2.13.16"
val scala3 = "3.3.5"
}

object Versions {
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")

addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")

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

Expand Down

0 comments on commit d333732

Please sign in to comment.