Skip to content

Commit

Permalink
Update Scala versions to 2.13.13 and 2.12.19
Browse files Browse the repository at this point in the history
  • Loading branch information
kluen authored and Kristof Lünenschloß committed Mar 11, 2024
1 parent b986199 commit f803014
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import scala.io.Source
import scala.language.postfixOps
import sbt.io.Using

val currentScalaVersion = "2.13.8"
val currentScalaVersion = "2.13.13"

inThisBuild(
Seq(
Expand All @@ -26,7 +26,7 @@ lazy val commonSettings =
Seq(
organization := "org.mockito",
// Load version from the file so that Gradle/Shipkit and SBT use the same version
crossScalaVersions := Seq(currentScalaVersion, "2.12.18", "2.11.12"),
crossScalaVersions := Seq(currentScalaVersion, "2.12.19", "2.11.12"),
scalafmtOnCompile := true,
scalacOptions ++= Seq(
"-unchecked",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package org.mockito.specs2

import java.io.{ File, FileOutputStream, ObjectOutputStream }
import java.util

import org.hamcrest.core.IsNull
import org.mockito.IdiomaticMockitoBase.Times
import org.mockito.VerifyOrder
import org.mockito.captor.ArgCaptor
import org.mockito.invocation.InvocationOnMock
import org.mockito.stubbing.DefaultAnswer
Expand Down Expand Up @@ -661,7 +661,7 @@ The Mockito trait is reusable in other contexts
"ex1" in new org.specs2.specification.Scope {
val (list1, list2) = (mock[java.util.List[String]], mock[java.util.List[String]])
list1.add("two"); list2.add("one")
implicit val order = inOrder(list1, list2)
implicit val order: VerifyOrder = inOrder(list1, list2)
list2.add("two").was(called) andThen list1.add("one").was(called)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package org.mockito.specs2

import java.io.{ File, FileOutputStream, ObjectOutputStream }
import java.util

import org.hamcrest.core.IsNull
import org.mockito.VerifyOrder
import org.mockito.captor.ArgCaptor
import org.mockito.invocation.InvocationOnMock
import org.mockito.stubbing.DefaultAnswer
Expand Down Expand Up @@ -660,7 +660,7 @@ The Mockito trait is reusable in other contexts
"ex1" in new org.specs2.specification.Scope {
val (list1, list2) = (mock[java.util.List[String]], mock[java.util.List[String]])
list1.add("two"); list2.add("one")
implicit val order = inOrder(list1, list2)
implicit val order: VerifyOrder = inOrder(list1, list2)
there was one(list2).add("two") andThen one(list1).add("one")
}
}
Expand Down

0 comments on commit f803014

Please sign in to comment.