diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000..fa947412 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.3 +d7d4bc4d51319e3a74b0e7858e68bd93e2e056f8 diff --git a/.scalafmt.conf b/.scalafmt.conf index d6020b35..13cd4b7d 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -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 diff --git a/docs/manual/working/scalaGuide/main/sql/slick/code/DI.scala b/docs/manual/working/scalaGuide/main/sql/slick/code/DI.scala index fd7253bd..7dbf21a1 100644 --- a/docs/manual/working/scalaGuide/main/sql/slick/code/DI.scala +++ b/docs/manual/working/scalaGuide/main/sql/slick/code/DI.scala @@ -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 => diff --git a/project/build.properties b/project/build.properties index 081fdbbc..ee4c672c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.0 +sbt.version=1.10.1 diff --git a/project/plugins.sbt b/project/plugins.sbt index 21eee473..52bb945a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,8 +4,8 @@ resolvers ++= Seq( Resolver.sonatypeRepo("snapshots"), // used by deploy nightlies, which publish here & use -Dplay.version ) -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.props.getOrElse("play.version", "2.9.4")) -addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.4")) +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % sys.props.getOrElse("play.version", "2.9.5")) +addSbtPlugin("com.typesafe.play" % "play-docs-sbt-plugin" % sys.props.getOrElse("play.version", "2.9.5")) addSbtPlugin("com.typesafe.play" % "interplay" % sys.props.get("interplay.version").getOrElse("3.1.7")) addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")