diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 06da4da483..f2c8c0de46 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -6,3 +6,6 @@ d338861916380701fb1a3cf557bb2b0f18792075 # Scala Steward: Reformat with scalafmt 3.7.3 9685d201c17c737cf4617ec648d76aff461bd831 + +# Scala Steward: Reformat with scalafmt 3.7.14 +85133289bbd902a9fa5c13ff515eda5c0b58fd1d diff --git a/.scalafmt.conf b/.scalafmt.conf index 0aaaa04410..792e8620f8 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.3 +version = 3.7.14 maxColumn = 120 align.preset = more diff --git a/profiling/project/plugins.sbt b/profiling/project/plugins.sbt index 103c04f07b..f8c617df58 100644 --- a/profiling/project/plugins.sbt +++ b/profiling/project/plugins.sbt @@ -1,3 +1,3 @@ addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "1.1.0") -addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") +addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") diff --git a/project/BuildHelper.scala b/project/BuildHelper.scala index 324ffd2e90..039dcaf6ed 100644 --- a/project/BuildHelper.scala +++ b/project/BuildHelper.scala @@ -74,7 +74,7 @@ object BuildHelper extends ScalaSettings { scalacOptions := stdOptions ++ extraOptions(scalaVersion.value), ThisBuild / scalafixDependencies ++= List( - "com.github.vovapolu" %% "scaluzzi" % "0.1.23", + "com.github.vovapolu" %% "scaluzzi" % "0.1.23", ), Test / parallelExecution := true, incOptions ~= (_.withLogRecompileOnMacro(false)), diff --git a/project/Shading.scala b/project/Shading.scala index c76c6a61dc..ac86dca6c5 100644 --- a/project/Shading.scala +++ b/project/Shading.scala @@ -21,11 +21,12 @@ object Shading { } else Nil lazy val shadingEnabled = { - val enabled = sys.props.get(sysprops.`publish.shaded`).fold(false)(_.toBoolean) || + val enabled = sys.props.get(sysprops.`publish.shaded`).fold(false)(_.toBoolean) || sys.env.get(env.PUBLISH_SHADED).fold(false)(_.toBoolean) - println(s"*** shading enabled: $enabled (env.PUBLISH_SHADED=${sys.env.get(env.PUBLISH_SHADED)}, sysprops.`publish.shaded`=${sys.props.get(sysprops.`publish.shaded`)})") + println(s"*** shading enabled: $enabled (env.PUBLISH_SHADED=${sys.env + .get(env.PUBLISH_SHADED)}, sysprops.`publish.shaded`=${sys.props.get(sysprops.`publish.shaded`)})") enabled } - def plugins(): Seq[Plugins] = if(shadingEnabled) Seq(ShadingPlugin) else Nil + def plugins(): Seq[Plugins] = if (shadingEnabled) Seq(ShadingPlugin) else Nil }