From 18e76fc66f070f747d423d2e09306b71fc8fd26f Mon Sep 17 00:00:00 2001 From: "fmonniot-s-scala-steward[bot]" <152087597+fmonniot-s-scala-steward[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2024 01:42:47 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.3 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 1c02f6e..e9dea8f 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.2" +version = "3.8.3" runner.dialect = scala3 fileOverride { "glob:**/*.sbt" { From 57615e491e61d9996b7afb6b3d8707063a12c08b Mon Sep 17 00:00:00 2001 From: "fmonniot-s-scala-steward[bot]" <152087597+fmonniot-s-scala-steward[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2024 01:42:51 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.3 Executed command: scalafmt --non-interactive --- build.sbt | 5 ++--- .../eu/monniot/scala3mock/macros/WhenImpl.scala | 12 ++++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index a5dd46b..bf9cd7b 100644 --- a/build.sbt +++ b/build.sbt @@ -88,10 +88,9 @@ lazy val integration = project .in(file("./integration")) .settings( name := "scala3mock-integration-tests", - crossScalaVersions := Seq("3.3.3", "3.4.0", "3.5.0-RC1"), // Note that this means we need to publish core via publishLocal first. libraryDependencies += "eu.monniot" %% "scala3mock" % version.value % Test, - libraryDependencies += "org.scalameta" %% "munit" % "1.0.0-M11" % Test, - ) \ No newline at end of file + libraryDependencies += "org.scalameta" %% "munit" % "1.0.0-M11" % Test + ) diff --git a/core/src/main/scala/eu/monniot/scala3mock/macros/WhenImpl.scala b/core/src/main/scala/eu/monniot/scala3mock/macros/WhenImpl.scala index b96a00d..be0975f 100644 --- a/core/src/main/scala/eu/monniot/scala3mock/macros/WhenImpl.scala +++ b/core/src/main/scala/eu/monniot/scala3mock/macros/WhenImpl.scala @@ -39,32 +39,32 @@ private[scala3mock] object WhenImpl: def apply[T1, T2, T3, T4, R](f: Expr[(T1, T2, T3, T4) => R])(using Type[T1], Type[T2], Type[T3], Type[T4], Type[R], Quotes): Expr[MockFunction4[T1, T2, T3, T4, R]] = '{${createMockFunction(f)}.asInstanceOf[MockFunction4[T1, T2, T3, T4, R]]} - def apply[T1, T2, T3, T4, T5, R](f: Expr[(T1, T2, T3, T4, T5) => R])(using + def apply[T1, T2, T3, T4, T5, R](f: Expr[(T1, T2, T3, T4, T5) => R])(using Type[T1], Type[T2], Type[T3], Type[T4], Type[T5], Type[R], Quotes): Expr[MockFunction5[T1, T2, T3, T4, T5, R]] = '{${createMockFunction(f)}.asInstanceOf[MockFunction5[T1, T2, T3, T4, T5, R]]} - def apply[T1, T2, T3, T4, T5, T6, R](f: Expr[(T1, T2, T3, T4, T5, T6) => R])(using + def apply[T1, T2, T3, T4, T5, T6, R](f: Expr[(T1, T2, T3, T4, T5, T6) => R])(using Type[T1], Type[T2], Type[T3], Type[T4], Type[T5], Type[T6], Type[R], Quotes): Expr[MockFunction6[T1, T2, T3, T4, T5, T6, R]] = '{${createMockFunction(f)}.asInstanceOf[MockFunction6[T1, T2, T3, T4, T5, T6, R]]} - def apply[T1, T2, T3, T4, T5, T6, T7, R](f: Expr[(T1, T2, T3, T4, T5, T6, T7) => R])(using + def apply[T1, T2, T3, T4, T5, T6, T7, R](f: Expr[(T1, T2, T3, T4, T5, T6, T7) => R])(using Type[T1], Type[T2], Type[T3], Type[T4], Type[T5], Type[T6], Type[T7], Type[R], Quotes): Expr[MockFunction7[T1, T2, T3, T4, T5, T6, T7, R]] = '{${createMockFunction(f)}.asInstanceOf[MockFunction7[T1, T2, T3, T4, T5, T6, T7, R]]} - def apply[T1, T2, T3, T4, T5, T6, T7, T8, R](f: Expr[(T1, T2, T3, T4, T5, T6, T7, T8) => R])(using + def apply[T1, T2, T3, T4, T5, T6, T7, T8, R](f: Expr[(T1, T2, T3, T4, T5, T6, T7, T8) => R])(using Type[T1], Type[T2], Type[T3], Type[T4], Type[T5], Type[T6], Type[T7], Type[T8], Type[R], Quotes): Expr[MockFunction8[T1, T2, T3, T4, T5, T6, T7, T8, R]] = '{${createMockFunction(f)}.asInstanceOf[MockFunction8[T1, T2, T3, T4, T5, T6, T7, T8, R]]} - def apply[T1, T2, T3, T4, T5, T6, T7, T8, T9, R](f: Expr[(T1, T2, T3, T4, T5, T6, T7, T8, T9) => R])(using + def apply[T1, T2, T3, T4, T5, T6, T7, T8, T9, R](f: Expr[(T1, T2, T3, T4, T5, T6, T7, T8, T9) => R])(using Type[T1], Type[T2], Type[T3], Type[T4], Type[T5], Type[T6], Type[T7], Type[T8],Type[T9], Type[R], Quotes): Expr[MockFunction9[T1, T2, T3, T4, T5, T6, T7, T8, T9, R]] = '{${createMockFunction(f)}.asInstanceOf[MockFunction9[T1, T2, T3, T4, T5, T6, T7, T8, T9, R]]} - def apply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R](f: Expr[(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) => R])(using + def apply[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R](f: Expr[(T1, T2, T3, T4, T5, T6, T7, T8, T9, T10) => R])(using Type[T1], Type[T2], Type[T3], Type[T4], Type[T5], Type[T6], Type[T7], Type[T8],Type[T9],Type[T10], Type[R], Quotes): Expr[MockFunction10[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R]] = '{${createMockFunction(f)}.asInstanceOf[MockFunction10[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, R]]} From 8e9873a5245a4e16a28b37d32428a3122d2050be Mon Sep 17 00:00:00 2001 From: "fmonniot-s-scala-steward[bot]" <152087597+fmonniot-s-scala-steward[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2024 01:42:51 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.3' 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 ca7b9a8..2e9f147 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -3,3 +3,6 @@ d1f2a4f8d32f5706b23f7d85cc40712cbf4453a6 # Scala Steward: Reformat with scalafmt 3.8.2 18cd2d2a33848f818916bff615ed2a7ccfa62156 + +# Scala Steward: Reformat with scalafmt 3.8.3 +57615e491e61d9996b7afb6b3d8707063a12c08b