diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 8e833ebd..27cdb029 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -9,3 +9,6 @@ c846f08f0eba509d8f0f39114578cbe61465106d # Reformat with sbt-java-formatter 0.8.0 7dd5751d6a229092064deef13d121e34572ca59a + +# Scala Steward: Reformat with scalafmt 3.7.5 +c3b04b90d9863ca2c7b7e56bc0bda148ce392642 diff --git a/.scalafmt.conf b/.scalafmt.conf index 6f83e6ec..c89025bd 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.4 +version = 3.7.5 runner.dialect = scala213 diff --git a/sbt-twirl/src/sbt-test/twirl/compile-scala3/build.sbt b/sbt-twirl/src/sbt-test/twirl/compile-scala3/build.sbt index f1f74b69..36f63cec 100644 --- a/sbt-twirl/src/sbt-test/twirl/compile-scala3/build.sbt +++ b/sbt-twirl/src/sbt-test/twirl/compile-scala3/build.sbt @@ -1,16 +1,18 @@ // Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> -lazy val root = (project in file(".")).enablePlugins { - // Make sure scalajs plugin is not available - val sjsPluginName = "org.scalajs.sbtplugin.ScalaJSPlugin" - try Class.forName(sjsPluginName) - catch { - case _: ClassNotFoundException => // do nothing - case _: Throwable => throw new IllegalStateException(s"Found $sjsPluginName, but scalajs should not be required!") +lazy val root = (project in file(".")) + .enablePlugins { + // Make sure scalajs plugin is not available + val sjsPluginName = "org.scalajs.sbtplugin.ScalaJSPlugin" + try Class.forName(sjsPluginName) + catch { + case _: ClassNotFoundException => // do nothing + case _: Throwable => throw new IllegalStateException(s"Found $sjsPluginName, but scalajs should not be required!") + } + // Add the twirl plugin + SbtTwirl } - // Add the twirl plugin - SbtTwirl -}.settings( - scalaVersion := "3.3.0", - scalacOptions ++= Seq("-source:future", "-feature") -) + .settings( + scalaVersion := "3.3.0", + scalacOptions ++= Seq("-source:future", "-feature") + )