diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..3d0f0bb --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.2 +7052850ff0a05551f0543e3921ed870c8a517461 diff --git a/.scalafmt.conf b/.scalafmt.conf index 0543f7a..8b2b1f2 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.3.3" +version = "3.8.2" runner.dialect = scala213 maxColumn = 120 diff --git a/modules/dsl/src/main/scala/blaireau/metas/Meta.scala b/modules/dsl/src/main/scala/blaireau/metas/Meta.scala index f537b02..addeb52 100644 --- a/modules/dsl/src/main/scala/blaireau/metas/Meta.scala +++ b/modules/dsl/src/main/scala/blaireau/metas/Meta.scala @@ -212,7 +212,7 @@ object Meta { H, FieldType[K, MetaField[H]] :: HNil, MetaField[H] :: HNil, - ExtractedField[H] :: HNil, + ExtractedField[H] :: HNil ] = { val fieldName: String = w.value.name val fid = UUID.randomUUID() @@ -316,7 +316,7 @@ object Meta { Option[H], FieldType[K, OptionalMeta.Aux[H, HMF, HEF, IHF, IHMF, IHEF]] :: HNil, HMF, - ExtractedOptionalMeta[H, HMF, HEF, IHF, IHMF, IHEF] :: HNil, + ExtractedOptionalMeta[H, HMF, HEF, IHF, IHMF, IHEF] :: HNil ] = { val optionMeta = hOptionMeta.value @@ -325,7 +325,7 @@ object Meta { Option[H], FieldType[K, OptionalMeta.Aux[H, HMF, HEF, IHF, IHMF, IHEF]] :: HNil, HMF, - ExtractedOptionalMeta[H, HMF, HEF, IHF, IHMF, IHEF] :: HNil, + ExtractedOptionalMeta[H, HMF, HEF, IHF, IHMF, IHEF] :: HNil ]( optionMeta.codec, field[K](optionMeta) :: HNil, diff --git a/modules/tests/src/test/scala/blaireau/dsl/actions/AssignmentActionSpec.scala b/modules/tests/src/test/scala/blaireau/dsl/actions/AssignmentActionSpec.scala index b4622a8..f0a7c7f 100644 --- a/modules/tests/src/test/scala/blaireau/dsl/actions/AssignmentActionSpec.scala +++ b/modules/tests/src/test/scala/blaireau/dsl/actions/AssignmentActionSpec.scala @@ -37,7 +37,7 @@ class AssignmentActionSpec extends FunSuite { test("Multiple assignations") { val assign: AssignmentAction[String ~ Int] = (meta.name := "newName") <+> (meta.age := 42) - assert(assign, ("newName", 42), "name = $1, age = $2", (text ~ int4)) + assert(assign, ("newName", 42), "name = $1, age = $2", text ~ int4) } test("One embedded assignation") { diff --git a/project/plugins.sbt b/project/plugins.sbt index 91c0b69..4b51edb 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,4 +6,4 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") addSbtPlugin("com.timushev.sbt" % "sbt-rewarn" % "0.1.3") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4") -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") \ No newline at end of file +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")