Skip to content

Commit d333732

Browse files
authored
Merge pull request #515 from scala-steward/update/7.x/patches
[7.x] Patch updates
2 parents 2e3c96d + 15f0710 commit d333732

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

.github/workflows/build-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
uses: playframework/.github/.github/workflows/cmd.yml@v3
5454
with:
5555
java: 17, 11
56-
scala: 2.13.15, 3.3.3
56+
scala: 2.13.16, 3.3.3
5757
cmd: >-
5858
sbt "
5959
+publishLocal;

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in im
1010
trailingCommas = preserve
1111
newlines.afterCurlyLambda = preserve
1212
runner.dialect = scala212source3
13-
version = 3.8.3
13+
version = 3.8.6

docs/.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ spaces.inImportCurlyBraces = true # more idiomatic to include whitepsace in im
1313
trailingCommas = preserve
1414
newlines.afterCurlyLambda = preserve
1515
runner.dialect = scala212source3
16-
version = 3.8.3
16+
version = 3.8.6

docs/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ lazy val docs = project
2121
// No resource directories shuts the ebean agent up about java sources in the classes directory
2222
Test / unmanagedResourceDirectories := Nil,
2323
Test / parallelExecution := false,
24-
scalaVersion := "2.13.15",
25-
crossScalaVersions := Seq("2.13.15", "3.3.3"),
24+
scalaVersion := "2.13.16",
25+
crossScalaVersions := Seq("2.13.16", "3.3.3"),
2626
)
2727
.settings(
2828
Test / javafmt / sourceDirectories ++= (Test / unmanagedSourceDirectories).value,

docs/project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse(
1010

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

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

1515
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")

project/Dependencies.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ object Dependencies {
1010

1111
object ScalaVersions {
1212
val scala212 = "2.12.20"
13-
val scala213 = "2.13.15"
14-
val scala3 = "3.3.4"
13+
val scala213 = "2.13.16"
14+
val scala3 = "3.3.5"
1515
}
1616

1717
object Versions {

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
44

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

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

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

0 commit comments

Comments
 (0)