From 023ef4d5752ef6e5f93d15d05b5e90161b1b42a1 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 26 Nov 2025 19:55:51 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.10.2 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 12831e2..cf94ccc 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.10.1 +version = 3.10.2 align.preset = most literals.double = Upper From e85201b040700f8ac68b991f82d1c43bb95025fc Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 26 Nov 2025 19:55:57 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.10.2 Executed command: scalafmt --non-interactive --- src/test/scala/nl/gn0s1s/between/AxiomSpec.scala | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/scala/nl/gn0s1s/between/AxiomSpec.scala b/src/test/scala/nl/gn0s1s/between/AxiomSpec.scala index d87077d..2c13901 100644 --- a/src/test/scala/nl/gn0s1s/between/AxiomSpec.scala +++ b/src/test/scala/nl/gn0s1s/between/AxiomSpec.scala @@ -20,7 +20,7 @@ object AxiomSpec extends Properties("Axiom") { Interval[Instant](p, q).get, // i Interval[Instant](q, r).get, // j Interval[Instant](q, s).get, // k - Interval[Instant](t, q).get // l + Interval[Instant](t, q).get // l ) property("M1: if two periods both meet a third, then any period met by one must also be met by the other.") = @@ -40,7 +40,7 @@ object AxiomSpec extends Properties("Axiom") { Interval[Instant](p, q).get, // i Interval[Instant](q, r).get, // j Interval[Instant](s, t).get, // k - Interval[Instant](t, u).get // l + Interval[Instant](t, u).get // l ) property( @@ -71,7 +71,7 @@ object AxiomSpec extends Properties("Axiom") { r <- Gen.choose(q, Instant.MAX) if q < r } yield ( Interval[Instant](p, q).get, // i - Interval[Instant](q, r).get // j + Interval[Instant](q, r).get // j ) property("ML2: if i meets j then j does not meet i") = forAll(genML2) { case (i, j) => @@ -85,7 +85,7 @@ object AxiomSpec extends Properties("Axiom") { r <- Gen.choose(q, Instant.MAX) if q < r } yield ( Interval[Instant](p, q).get, // i - Interval[Instant](q, r).get // m + Interval[Instant](q, r).get // m ) property("ML3: there is no period m such that i:m:i,") = forAll(genML3) { case (i, m) => @@ -101,7 +101,7 @@ object AxiomSpec extends Properties("Axiom") { } yield ( Interval[Instant](p, q).get, // i r, // startOfJ - s // endOfK + s // endOfK ) property("M3: time does not start or stop") = forAll(genM3) { case (i, startOfJ, endOfK) => @@ -121,7 +121,7 @@ object AxiomSpec extends Properties("Axiom") { Interval[Instant](p, q).get, // i Interval[Instant](q, r).get, // j s, // startOfM - t // endOfN + t // endOfN ) property("M4: if two meets are separated by intervals, then this sequence is a longer interval") = forAll(genM4) { @@ -143,7 +143,7 @@ object AxiomSpec extends Properties("Axiom") { Interval[Instant](p, q).get, // i Interval[Instant](q, r).get, // j Interval[Instant](r, s).get, // l - Interval[Instant](q, s).get // k + Interval[Instant](q, s).get // k ) property("M5: There is only one time period between any two meeting-places.") = forAll(genM5) { case (i, j, l, k) => From ddfeddf8a4288609f7de897591ff35de1d689d84 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 26 Nov 2025 19:55:57 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.10.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 bf07daf..c9d7aae 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ # Scala Steward: Reformat with scalafmt 3.9.7 33326ceb21fb479ef37f76e8beef6c6b1e449a57 + +# Scala Steward: Reformat with scalafmt 3.10.2 +e85201b040700f8ac68b991f82d1c43bb95025fc