Skip to content

Commit

Permalink
Update scalafmt-core to 3.7.14 (#2426)
Browse files Browse the repository at this point in the history
* Update scalafmt-core to 3.7.14

* Reformat with scalafmt 3.7.14

Executed command: scalafmt --non-interactive

* Add 'Reformat with scalafmt 3.7.14' to .git-blame-ignore-revs
  • Loading branch information
scala-steward authored Sep 24, 2023
1 parent 70aabfc commit 8c8187b
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ d338861916380701fb1a3cf557bb2b0f18792075

# Scala Steward: Reformat with scalafmt 3.7.3
9685d201c17c737cf4617ec648d76aff461bd831

# Scala Steward: Reformat with scalafmt 3.7.14
85133289bbd902a9fa5c13ff515eda5c0b58fd1d
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.3
version = 3.7.14
maxColumn = 120

align.preset = more
Expand Down
4 changes: 2 additions & 2 deletions profiling/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
2 changes: 1 addition & 1 deletion project/BuildHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)),
Expand Down
7 changes: 4 additions & 3 deletions project/Shading.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

0 comments on commit 8c8187b

Please sign in to comment.