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

Update scalafmt-core to 3.8.3 #58

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.17
98879bf22a5e11b4adf2047825c9efa0b9a22428

# Scala Steward: Reformat with scalafmt 3.8.3
24e4581d26e7e20abb4a8be246dcd27c55fc4a8a
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.17"
version = "3.8.3"

runner.dialect=scala213source3

Expand Down
13 changes: 8 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
"co.fs2" %%% "fs2-core" % Version.fs2,
"org.typelevel" %%% "cats-effect" % Version.catsEffect,
// https://github.com/portable-scala/portable-scala-reflect/issues/23
"org.portable-scala" %%% "portable-scala-reflect" % Version.portableReflect cross CrossVersion.for3Use2_13,
"org.portable-scala" %%% "portable-scala-reflect" % Version
.portableReflect cross CrossVersion.for3Use2_13,
"org.typelevel" %% "scalac-compat-annotation" % Version.scalacCompatAnnotation,
"org.scalameta" %%% "munit-diff" % Version.munitDiff,
if (scalaVersion.value.startsWith("3."))
Expand All @@ -87,8 +88,9 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform)
lazy val coreJVM = core.jvm
.settings(
libraryDependencies ++= Seq(
"org.scala-js" %%% "scalajs-stubs" % Version.scalajsStubs % "provided" cross CrossVersion.for3Use2_13,
"junit" % "junit" % Version.junit % Optional
"org.scala-js" %%% "scalajs-stubs" % Version
.scalajsStubs % "provided" cross CrossVersion.for3Use2_13,
"junit" % "junit" % Version.junit % Optional
)
)

Expand All @@ -105,8 +107,9 @@ lazy val framework = crossProject(JVMPlatform, JSPlatform, NativePlatform)
lazy val frameworkJVM = framework.jvm
.settings(
libraryDependencies ++= Seq(
"org.scala-sbt" % "test-interface" % Version.testInterface,
"org.scala-js" %%% "scalajs-stubs" % Version.scalajsStubs % "provided" cross CrossVersion.for3Use2_13
"org.scala-sbt" % "test-interface" % Version.testInterface,
"org.scala-js" %%% "scalajs-stubs" % Version
.scalajsStubs % "provided" cross CrossVersion.for3Use2_13
)
)

Expand Down
14 changes: 6 additions & 8 deletions modules/core/shared/src/main/scala-3/weaver/ExpectMacro.scala
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@ private[weaver] trait ExpectMacro {
* Use the [[Expectations.Helpers.clue]] function to investigate any failures.
*/
inline def apply(assertion: Clues ?=> Boolean): Expectations =
${ ExpectMacro.applyImpl('assertion) }
${ ExpectMacro.applyImpl('assertion) }

/**
* Asserts that a boolean value is true and displays a failure message if
* not.
*
* Use the [[Expectations.Helpers.clue]] function to investigate any
* failures.
*/
/**
* Asserts that a boolean value is true and displays a failure message if not.
*
* Use the [[Expectations.Helpers.clue]] function to investigate any failures.
*/
inline def apply(
assertion: Clues ?=> Boolean,
message: => String): Expectations =
Expand Down
3 changes: 2 additions & 1 deletion modules/core/shared/src/main/scala/weaver/Formatter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ object Formatter {
val newLine = '\n'
builder.append(formatResultStatus(name, result, outcome.duration))

if ((mode == Verbose && outcome.status.isFailed) || (mode == Summary && !outcome.status.isFailed))
if ((mode == Verbose && outcome.status
.isFailed) || (mode == Summary && !outcome.status.isFailed))
result.formatted.foreach { resultInfo =>
builder.append(EOL)
builder.append(resultInfo)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@ object DogFoodTests extends IOSuite {

val expected =
s"""
|- erroring with a long message: ${Meta.ErroringWithLongPayload.smiles} 0ms
|- erroring with a long message: ${Meta.ErroringWithLongPayload
.smiles} 0ms
| Meta$$CustomException: surfaced error
|
| DogFoodTests.scala:15 my.package.MyClass#MyMethod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ trait Checkers {
s"""Property test failed on try $ith with seed $seed and input $input.
|You can reproduce this by adding the following override to your suite:
|
|override def checkConfig = super.checkConfig.withInitialSeed($seed.toOption)""".stripMargin)
|override def checkConfig = super.checkConfig.withInitialSeed($seed.toOption)"""
.stripMargin)
.and(exp)
copy(failure = Some(failure))
} else this
Expand Down
Loading