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.

Sign up for GitHub

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 #34

Closed
wants to merge 3 commits into from
Closed

Update scalafmt-core to 3.8.3 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2f02ec
Update scalafmt-core to 3.8.3
scala-steward Aug 23, 2024
4b571c5
Reformat with scalafmt 3.8.3
scala-steward Aug 23, 2024
59858e7
Add 'Reformat with scalafmt 3.8.3' to .git-blame-ignore-revs
scala-steward Aug 23, 2024
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.8.0
69cd6a95a6d8ec56774478bef660698d87ba6b55

# Scala Steward: Reformat with scalafmt 3.8.3
4b571c582bcd8a82187f5ac0c65cb095b5c090c4
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.1"
version = "3.8.3"
runner.dialect = scala212Source3
style = defaultWithAlign
maxColumn = 100
Expand Down
6 changes: 4 additions & 2 deletions modules/plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("."))
Expand Down
4 changes: 2 additions & 2 deletions ...plugin/src/sbt-test/sbt-snapshot4s/multi-project-build/core/src/test/scala/CoreTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions .../sbt-test/sbt-snapshot4s/multi-project-build/framework/src/test/scala/FrameworkTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions ...ugin/src/sbt-test/sbt-snapshot4s/multi-project-build/utils/src/test/scala/UtilsTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion ...ugin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/MunitSimpleTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package simple

import snapshot4s.munit.SnapshotAssertions
import snapshot4s.generated._
import snapshot4s.generated.*

class MunitSimpleTest extends munit.FunSuite with SnapshotAssertions {

Expand Down
2 changes: 1 addition & 1 deletion .../src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/ScalaTestSimpleTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions ...gin/src/sbt-test/sbt-snapshot4s/multiple-frameworks/src/test/scala/WeaverSimpleTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion modules/plugin/src/sbt-test/sbt-snapshot4s/munit/src/test/scala/SimpleTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package simple

import snapshot4s.munit.SnapshotAssertions
import snapshot4s.generated._
import snapshot4s.generated.*

class SimpleTest extends munit.FunSuite with SnapshotAssertions {

Expand Down
6 changes: 3 additions & 3 deletions ...-test/sbt-snapshot4s/projectmatrix/core/src/test/scala-2/ScalaJVMAndScalaJS2Or3Test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
9 changes: 4 additions & 5 deletions ...-test/sbt-snapshot4s/projectmatrix/core/src/test/scala-3/ScalaJVMAndScalaJS2Or3Test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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", ???)
Expand All @@ -18,4 +18,3 @@ object ScalaJVMAndScalaJS2Or3Test extends SimpleIOSuite with SnapshotExpectation
test("file") {
assertFileSnapshot("contents", "existing-file")
}
}
4 changes: 2 additions & 2 deletions ...rc/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scala/ScalaJVMAndScalaJSTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...t-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajs-3/ScalaJVM3OrScalaJS3Test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions .../plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajs/ScalaJSTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...-test/sbt-snapshot4s/projectmatrix/core/src/test/scalajvm-3/ScalaJVM3OrScalaJS3Test.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion modules/plugin/src/sbt-test/sbt-snapshot4s/projectmatrix/project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) =>
Expand Down
2 changes: 1 addition & 1 deletion ...lugin/src/sbt-test/sbt-snapshot4s/reject-outdated-patches/src/test/scala/SimpleTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package simple

import weaver._
import weaver.*
import snapshot4s.weaver.SnapshotExpectations
import snapshot4s.generated.snapshotConfig

Expand Down
2 changes: 1 addition & 1 deletion modules/plugin/src/sbt-test/sbt-snapshot4s/scala-js/src/test/scala/SimpleTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package simple

import weaver._
import weaver.*
import snapshot4s.weaver.SnapshotExpectations
import snapshot4s.generated.snapshotConfig

Expand Down
2 changes: 1 addition & 1 deletion modules/plugin/src/sbt-test/sbt-snapshot4s/scalatest/src/test/scala/SimpleTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
2 changes: 1 addition & 1 deletion modules/plugin/src/sbt-test/sbt-snapshot4s/simple/src/test/scala/SimpleTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package simple

import weaver._
import weaver.*
import snapshot4s.weaver.SnapshotExpectations
import snapshot4s.generated.snapshotConfig

Expand Down
Loading