From a7d15bd8064c1b522018f38841816c959033fc34 Mon Sep 17 00:00:00 2001 From: Gosha Kovalyov Date: Tue, 5 Sep 2023 11:02:04 +0600 Subject: [PATCH] fix crossScalaVersions and tests --- build.sbt | 2 +- project/plugins.sbt | 2 +- shared/src/main/scala/org/scalamock/proxy/FakeFunction.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index b09e82c8..210c2abe 100644 --- a/build.sbt +++ b/build.sbt @@ -48,7 +48,7 @@ def crossScalaSettings = { } } Seq( - crossScalaVersions := Seq("2.12.17", "2.13.8"), + crossScalaVersions := Seq("2.12.17", scalaVersion.value), Compile / unmanagedSourceDirectories ++= addDirsByScalaVersion("src/main").value, Test / unmanagedSourceDirectories ++= addDirsByScalaVersion("src/test").value, libraryDependencies ++= { diff --git a/project/plugins.sbt b/project/plugins.sbt index 3bc848ee..32f6e0ab 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,5 +3,5 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21") //addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0-M2") addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.10.1") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.2") addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.1") diff --git a/shared/src/main/scala/org/scalamock/proxy/FakeFunction.scala b/shared/src/main/scala/org/scalamock/proxy/FakeFunction.scala index 0c7234c6..576e744b 100644 --- a/shared/src/main/scala/org/scalamock/proxy/FakeFunction.scala +++ b/shared/src/main/scala/org/scalamock/proxy/FakeFunction.scala @@ -29,7 +29,7 @@ import org.scalamock.function abstract class FakeFunction(mockContext: MockContext, name: Symbol) extends function.FakeFunction(mockContext, name) with NiceToString { - def handle(args: Array[AnyRef]): Any = handle(seq2Product(args.toSeq)) + def handle(args: Array[AnyRef]): Any = handle(seq2Product(args)) class ExpectationHandler { def apply(args: MockParameter[Any]*) =