Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Scala versions to 2.13.13 and 2.12.19 #527

Merged
merged 1 commit into from
Apr 2, 2024
Merged

Update Scala versions to 2.13.13 and 2.12.19 #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.sbt
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions specs2/src/test/scala/org/mockito/specs2/MockitoScalaNewSyntaxSpec.scala
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions specs2/src/test/scala/org/mockito/specs2/MockitoScalaSpec.scala
View file
Open in desktop
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
Loading