diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index e63df6b..44667a6 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Scala Steward: Reformat with scalafmt 3.8.0 69cd6a95a6d8ec56774478bef660698d87ba6b55 + +# Scala Steward: Reformat with scalafmt 3.8.3 +4b571c582bcd8a82187f5ac0c65cb095b5c090c4 diff --git a/.scalafmt.conf b/.scalafmt.conf index 66f5474..ba0ede9 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.1" +version = "3.8.3" runner.dialect = scala212Source3 style = defaultWithAlign maxColumn = 100 diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/build.sbt b/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/build.sbt index 7c149f7..d16b924 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/build.sbt +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/build.sbt @@ -11,14 +11,16 @@ lazy val utils = (project in file("utils")) .settings( scalaVersion := "3.3.1", libraryDependencies += "com.siriusxm" %% "snapshot4s-weaver" % snapshot4sVersion % Test - ).dependsOn(core) + ) + .dependsOn(core) .enablePlugins(Snapshot4sPlugin) lazy val framework = (project in file("framework")) .settings( scalaVersion := "3.3.1", libraryDependencies += "com.siriusxm" %% "snapshot4s-weaver" % snapshot4sVersion % Test - ).dependsOn(core % "compile->compile;test->test") + ) + .dependsOn(core % "compile->compile;test->test") .enablePlugins(Snapshot4sPlugin) lazy val root = (project in file(".")) diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/core/src/test/scala/CoreTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/core/src/test/scala/CoreTest.scala index 6600323..c58b16b 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/core/src/test/scala/CoreTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/core/src/test/scala/CoreTest.scala @@ -1,8 +1,8 @@ package core -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations -import snapshot4s.generated._ +import snapshot4s.generated.* object CoreTest extends SimpleIOSuite with SnapshotExpectations { diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/framework/src/test/scala/FrameworkTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/framework/src/test/scala/FrameworkTest.scala index d412d74..84e8f10 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/framework/src/test/scala/FrameworkTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/framework/src/test/scala/FrameworkTest.scala @@ -1,8 +1,8 @@ package framework -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations -import snapshot4s.generated._ +import snapshot4s.generated.* object FrameworkTest extends SimpleIOSuite with SnapshotExpectations { diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/utils/src/test/scala/UtilsTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/utils/src/test/scala/UtilsTest.scala index c5dcad6..2707f60 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/utils/src/test/scala/UtilsTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/utils/src/test/scala/UtilsTest.scala @@ -1,8 +1,8 @@ package utils -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations -import snapshot4s.generated._ +import snapshot4s.generated.* object UtilsTest extends SimpleIOSuite with SnapshotExpectations { diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/MunitSimpleTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/MunitSimpleTest.scala index 20bd19f..7873bd9 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/MunitSimpleTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/MunitSimpleTest.scala @@ -1,7 +1,7 @@ package simple import snapshot4s.munit.SnapshotAssertions -import snapshot4s.generated._ +import snapshot4s.generated.* class MunitSimpleTest extends munit.FunSuite with SnapshotAssertions { diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/ScalaTestSimpleTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/ScalaTestSimpleTest.scala index 9535149..a502706 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/ScalaTestSimpleTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/ScalaTestSimpleTest.scala @@ -2,7 +2,7 @@ package simple import org.scalatest.flatspec.AnyFlatSpec import snapshot4s.scalatest.SnapshotAssertions -import snapshot4s.generated._ +import snapshot4s.generated.* class SimpleTest extends AnyFlatSpec with SnapshotAssertions { diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/WeaverSimpleTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/WeaverSimpleTest.scala index 5cac4c8..e1967e5 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/WeaverSimpleTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/WeaverSimpleTest.scala @@ -1,8 +1,8 @@ package simple -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations -import snapshot4s.generated._ +import snapshot4s.generated.* object WeaverSimpleTest extends SimpleIOSuite with SnapshotExpectations { diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/munit/src/test/scala/SimpleTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/munit/src/test/scala/SimpleTest.scala index 4bbd8e7..1af8d66 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/munit/src/test/scala/SimpleTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/munit/src/test/scala/SimpleTest.scala @@ -1,7 +1,7 @@ package simple import snapshot4s.munit.SnapshotAssertions -import snapshot4s.generated._ +import snapshot4s.generated.* class SimpleTest extends munit.FunSuite with SnapshotAssertions { diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala-2/ScalaJVMAndScalaJS2Or3Test.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala-2/ScalaJVMAndScalaJS2Or3Test.scala index e50791d..a7f4ee0 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala-2/ScalaJVMAndScalaJS2Or3Test.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala-2/ScalaJVMAndScalaJS2Or3Test.scala @@ -1,12 +1,12 @@ package core -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations -import snapshot4s.generated._ +import snapshot4s.generated.* /** This test runs on the both the JVM and JS platforms for Scala 2 only. * There is a test with the same name for Scala 3. - * + * * We verify that the Scala 2 and Scala 3 snapshots are updated independently. */ object ScalaJVMAndScalaJS2Or3Test extends SimpleIOSuite with SnapshotExpectations { diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala-3/ScalaJVMAndScalaJS2Or3Test.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala-3/ScalaJVMAndScalaJS2Or3Test.scala index e1ebeba..29a742c 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala-3/ScalaJVMAndScalaJS2Or3Test.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala-3/ScalaJVMAndScalaJS2Or3Test.scala @@ -1,15 +1,15 @@ package core -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations -import snapshot4s.generated._ +import snapshot4s.generated.* /** This test runs on the both the JVM and JS platforms for Scala 3 only. * There is a test with the same name for Scala 2. - * + * * We verify that the Scala 2 and Scala 3 snapshots are updated independently. */ -object ScalaJVMAndScalaJS2Or3Test extends SimpleIOSuite with SnapshotExpectations { +object ScalaJVMAndScalaJS2Or3Test extends SimpleIOSuite with SnapshotExpectations: test("inline") { assertInlineSnapshot("scalajvm-3-and-js-3", ???) @@ -18,4 +18,3 @@ object ScalaJVMAndScalaJS2Or3Test extends SimpleIOSuite with SnapshotExpectation test("file") { assertFileSnapshot("contents", "existing-file") } -} diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala/ScalaJVMAndScalaJSTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala/ScalaJVMAndScalaJSTest.scala index 84cd6ae..d6cc9a5 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala/ScalaJVMAndScalaJSTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala/ScalaJVMAndScalaJSTest.scala @@ -1,8 +1,8 @@ package core -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations -import snapshot4s.generated._ +import snapshot4s.generated.* /** This test runs on the both the JVM and JS platforms for all Scala versions. */ object ScalaJVMAndScalaJSTest extends SimpleIOSuite with SnapshotExpectations { diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajs-3/ScalaJVM3OrScalaJS3Test.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajs-3/ScalaJVM3OrScalaJS3Test.scala index 041cb33..806da75 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajs-3/ScalaJVM3OrScalaJS3Test.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajs-3/ScalaJVM3OrScalaJS3Test.scala @@ -1,8 +1,8 @@ package core -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations -import snapshot4s.generated._ +import snapshot4s.generated.* /** This test runs on the JS platform for Scala 3 only. * There is a test with the same name, but different contents, for the JVM platform. diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajs/ScalaJSTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajs/ScalaJSTest.scala index d60d9a0..69ce565 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajs/ScalaJSTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajs/ScalaJSTest.scala @@ -1,8 +1,8 @@ package core -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations -import snapshot4s.generated._ +import snapshot4s.generated.* /** This test runs on the JS platform for all Scala versions. */ object ScalaJSTest extends SimpleIOSuite with SnapshotExpectations { diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajvm-3/ScalaJVM3OrScalaJS3Test.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajvm-3/ScalaJVM3OrScalaJS3Test.scala index dc959cd..6ff1903 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajvm-3/ScalaJVM3OrScalaJS3Test.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajvm-3/ScalaJVM3OrScalaJS3Test.scala @@ -1,8 +1,8 @@ package core -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations -import snapshot4s.generated._ +import snapshot4s.generated.* /** This test runs on the JVM platform for Scala 3 only. * There is a test with the same name, but different contents, for the ScalaJS platform. diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/project/plugins.sbt b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/project/plugins.sbt index 836e2fa..983fe0f 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/project/plugins.sbt +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/project/plugins.sbt @@ -1,5 +1,5 @@ addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.10.0") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0") sys.props.get("plugin.version") match { case Some(x) => diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/reject-outdated-patches/src/test/scala/SimpleTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/reject-outdated-patches/src/test/scala/SimpleTest.scala index 9583e08..c327e90 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/reject-outdated-patches/src/test/scala/SimpleTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/reject-outdated-patches/src/test/scala/SimpleTest.scala @@ -1,6 +1,6 @@ package simple -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations import snapshot4s.generated.snapshotConfig diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/scala-js/src/test/scala/SimpleTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/scala-js/src/test/scala/SimpleTest.scala index 989a7d7..11cddf4 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/scala-js/src/test/scala/SimpleTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/scala-js/src/test/scala/SimpleTest.scala @@ -1,6 +1,6 @@ package simple -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations import snapshot4s.generated.snapshotConfig diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/scalatest/src/test/scala/SimpleTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/scalatest/src/test/scala/SimpleTest.scala index 9535149..a502706 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/scalatest/src/test/scala/SimpleTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/scalatest/src/test/scala/SimpleTest.scala @@ -2,7 +2,7 @@ package simple import org.scalatest.flatspec.AnyFlatSpec import snapshot4s.scalatest.SnapshotAssertions -import snapshot4s.generated._ +import snapshot4s.generated.* class SimpleTest extends AnyFlatSpec with SnapshotAssertions { diff --git a/modules/plugin/src/sbt-test/sbt-snapshot4s/simple/src/test/scala/SimpleTest.scala b/modules/plugin/src/sbt-test/sbt-snapshot4s/simple/src/test/scala/SimpleTest.scala index 989a7d7..11cddf4 100644 --- a/modules/plugin/src/sbt-test/sbt-snapshot4s/simple/src/test/scala/SimpleTest.scala +++ b/modules/plugin/src/sbt-test/sbt-snapshot4s/simple/src/test/scala/SimpleTest.scala @@ -1,6 +1,6 @@ package simple -import weaver._ +import weaver.* import snapshot4s.weaver.SnapshotExpectations import snapshot4s.generated.snapshotConfig