Skip to content

Commit 8522971

Browse files
authored
Update Scala versions to 2.13.13 and 2.12.19 (#527)
1 parent b986199 commit 8522971

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Diff for: build.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import scala.io.Source
22
import scala.language.postfixOps
33
import sbt.io.Using
44

5-
val currentScalaVersion = "2.13.8"
5+
val currentScalaVersion = "2.13.13"
66

77
inThisBuild(
88
Seq(
@@ -26,7 +26,7 @@ lazy val commonSettings =
2626
Seq(
2727
organization := "org.mockito",
2828
// Load version from the file so that Gradle/Shipkit and SBT use the same version
29-
crossScalaVersions := Seq(currentScalaVersion, "2.12.18", "2.11.12"),
29+
crossScalaVersions := Seq(currentScalaVersion, "2.12.19", "2.11.12"),
3030
scalafmtOnCompile := true,
3131
scalacOptions ++= Seq(
3232
"-unchecked",

Diff for: specs2/src/test/scala/org/mockito/specs2/MockitoScalaNewSyntaxSpec.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package org.mockito.specs2
22

33
import java.io.{ File, FileOutputStream, ObjectOutputStream }
44
import java.util
5-
65
import org.hamcrest.core.IsNull
76
import org.mockito.IdiomaticMockitoBase.Times
7+
import org.mockito.VerifyOrder
88
import org.mockito.captor.ArgCaptor
99
import org.mockito.invocation.InvocationOnMock
1010
import org.mockito.stubbing.DefaultAnswer
@@ -661,7 +661,7 @@ The Mockito trait is reusable in other contexts
661661
"ex1" in new org.specs2.specification.Scope {
662662
val (list1, list2) = (mock[java.util.List[String]], mock[java.util.List[String]])
663663
list1.add("two"); list2.add("one")
664-
implicit val order = inOrder(list1, list2)
664+
implicit val order: VerifyOrder = inOrder(list1, list2)
665665
list2.add("two").was(called) andThen list1.add("one").was(called)
666666
}
667667
}

Diff for: specs2/src/test/scala/org/mockito/specs2/MockitoScalaSpec.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package org.mockito.specs2
22

33
import java.io.{ File, FileOutputStream, ObjectOutputStream }
44
import java.util
5-
65
import org.hamcrest.core.IsNull
6+
import org.mockito.VerifyOrder
77
import org.mockito.captor.ArgCaptor
88
import org.mockito.invocation.InvocationOnMock
99
import org.mockito.stubbing.DefaultAnswer
@@ -660,7 +660,7 @@ The Mockito trait is reusable in other contexts
660660
"ex1" in new org.specs2.specification.Scope {
661661
val (list1, list2) = (mock[java.util.List[String]], mock[java.util.List[String]])
662662
list1.add("two"); list2.add("one")
663-
implicit val order = inOrder(list1, list2)
663+
implicit val order: VerifyOrder = inOrder(list1, list2)
664664
there was one(list2).add("two") andThen one(list1).add("one")
665665
}
666666
}

0 commit comments

Comments
 (0)