Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

scalafmt-core 3.7.5 (was 3.7.4) #632

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ c846f08f0eba509d8f0f39114578cbe61465106d

# Reformat with sbt-java-formatter 0.8.0
7dd5751d6a229092064deef13d121e34572ca59a

# Scala Steward: Reformat with scalafmt 3.7.5
c3b04b90d9863ca2c7b7e56bc0bda148ce392642
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.4
version = 3.7.5

runner.dialect = scala213

Expand Down
28 changes: 15 additions & 13 deletions sbt-twirl/src/sbt-test/twirl/compile-scala3/build.sbt
Original file line number Diff line number Diff line change
@@ -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")
)