Skip to content

Commit

Permalink
Merge pull request #62 from fmonniot/update/scalafmt-core-3.8.3
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.8.3
  • Loading branch information
fmonniot committed Jul 28, 2024
2 parents 7968270 + 8e9873a commit fa240ea
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ d1f2a4f8d32f5706b23f7d85cc40712cbf4453a6

# Scala Steward: Reformat with scalafmt 3.8.2
18cd2d2a33848f818916bff615ed2a7ccfa62156

# Scala Steward: Reformat with scalafmt 3.8.3
57615e491e61d9996b7afb6b3d8707063a12c08b
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.2"
version = "3.8.3"
runner.dialect = scala3
fileOverride {
"glob:**/*.sbt" {
Expand Down
5 changes: 2 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
libraryDependencies += "org.scalameta" %% "munit" % "1.0.0-M11" % Test
)
12 changes: 6 additions & 6 deletions core/src/main/scala/eu/monniot/scala3mock/macros/WhenImpl.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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]]}
Expand Down

0 comments on commit fa240ea

Please sign in to comment.