Skip to content

Commit

Permalink
Merge pull request #510 from scala-steward/update/6.0.x/patches
Browse files Browse the repository at this point in the history
[6.0.x] Patch updates
  • Loading branch information
mkurz authored Jun 7, 2024
2 parents d8f3efe + 9cb7caa commit 8cc0e8d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ lazy val mimaSettings = Seq(
)

lazy val commonSettings = Seq(
scalaVersion := "2.13.12",
crossScalaVersions := Seq("2.13.12", "3.3.1"),
scalaVersion := "2.13.14",
crossScalaVersions := Seq("2.13.14", "3.3.3"),
Test / parallelExecution := false,
Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-oTK"),
headerLicense := Some(
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.8
sbt.version=1.9.9
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ resolvers ++= DefaultOptions.resolvers(snapshot = true)
resolvers ++= Resolver
.sonatypeOssRepos("snapshots") // used by deploy nightlies, which publish here & use -Dplay.version

addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.1"))
addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.3"))

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3")
Expand Down

0 comments on commit 8cc0e8d

Please sign in to comment.