Skip to content

Commit

Permalink
Merge pull request #883 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 Jul 30, 2024
2 parents eb026f4 + 240a8cf commit b9e40ba
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.8.3
1e62cf12b325241f0f2daa545653b49dc459b9ee
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file was originally copied from https://github.com/playframework/playframework/blob/main/.scalafmt.conf
version = 3.8.2
version = 3.8.3
runner.dialect = scala213
align.preset = more
assumeStandardLibraryStripMargin = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ class Application @Inject() (protected val dbConfigProvider: DatabaseConfigProvi
) extends AbstractController(cc)
with HasDatabaseConfigProvider[JdbcProfile] {
// #di-database-config

import profile.api._

def index(name: String) = Action.async { implicit request =>
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.10.0
sbt.version=1.10.1
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ resolvers ++= Resolver.sonatypeOssRepos(
"snapshots"
) // used by deploy nightlies, which publish here & use -Dplay.version

addSbtPlugin("org.playframework" % "sbt-plugin" % sys.props.getOrElse("play.version", "3.0.3"))
addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.3"))
addSbtPlugin("org.playframework" % "sbt-plugin" % sys.props.getOrElse("play.version", "3.0.5"))
addSbtPlugin("org.playframework" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "3.0.5"))

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

0 comments on commit b9e40ba

Please sign in to comment.