From 5601b20513a69957f074a25531a1630aaca0ea30 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 16:17:08 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 3a9f1f18..e5c6773f 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.17" +version = "3.8.2" runner.dialect=scala213source3 From 89bb910d54760f8c08069de7983d6965fb1bf637 Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 16:17:14 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.2 Executed command: scalafmt --non-interactive --- build.sbt | 13 ++++++++----- .../shared/src/main/scala/weaver/Formatter.scala | 3 ++- .../shared/src/test/scala/DogFoodTests.scala | 3 ++- .../src/main/scala/weaver/scalacheck/Checkers.scala | 3 ++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 8dcc1003..cd87e6c7 100644 --- a/build.sbt +++ b/build.sbt @@ -71,7 +71,8 @@ lazy val core = crossProject(JVMPlatform, JSPlatform, NativePlatform) "org.typelevel" %%% "cats-effect" % Version.catsEffect, "com.eed3si9n.expecty" %%% "expecty" % Version.expecty, // 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 ), @@ -85,8 +86,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, if (scalaVersion.value.startsWith("3.")) "org.scala-lang" % "scala-reflect" % scala213 else @@ -107,8 +109,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 ) ) diff --git a/modules/core/shared/src/main/scala/weaver/Formatter.scala b/modules/core/shared/src/main/scala/weaver/Formatter.scala index 1823a04b..b953284f 100644 --- a/modules/core/shared/src/main/scala/weaver/Formatter.scala +++ b/modules/core/shared/src/main/scala/weaver/Formatter.scala @@ -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) diff --git a/modules/framework-cats/shared/src/test/scala/DogFoodTests.scala b/modules/framework-cats/shared/src/test/scala/DogFoodTests.scala index ffa4affb..a21e9d8b 100644 --- a/modules/framework-cats/shared/src/test/scala/DogFoodTests.scala +++ b/modules/framework-cats/shared/src/test/scala/DogFoodTests.scala @@ -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 diff --git a/modules/scalacheck/shared/src/main/scala/weaver/scalacheck/Checkers.scala b/modules/scalacheck/shared/src/main/scala/weaver/scalacheck/Checkers.scala index 693359a1..b54c2cd2 100644 --- a/modules/scalacheck/shared/src/main/scala/weaver/scalacheck/Checkers.scala +++ b/modules/scalacheck/shared/src/main/scala/weaver/scalacheck/Checkers.scala @@ -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 From 7155228c6de7bac41ee2d5453de2fbbc818a25fd Mon Sep 17 00:00:00 2001 From: "typelevel-steward[bot]" <106827141+typelevel-steward[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 16:17:14 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.2' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index e4f7fda7..423f3af3 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.7.17 98879bf22a5e11b4adf2047825c9efa0b9a22428 + +# Scala Steward: Reformat with scalafmt 3.8.2 +89bb910d54760f8c08069de7983d6965fb1bf637