New SBT/Scala version and/or additional checks cause CircleCI to fail; sbt test runs green locally.

Author: DarrenBishop

common/src/main/scala/org/mockito/MockitoAPI.scala

@@ -626,9 +626,8 @@ private[mockito] trait MockitoEnhancer extends MockCreator {
   /**
    * Mocks the specified object only for the context of the block
    */
-  def withObjectMocked[O <: AnyRef: ClassTag](block: => Any)(implicit defaultAnswer: DefaultAnswer, $pt: Prettifier): Unit = {
+  def withObjectMocked[O <: AnyRef: ClassTag](block: => Any)(implicit defaultAnswer: DefaultAnswer, $pt: Prettifier): Unit =
     withObject[O](_ => withSettings(defaultAnswer), block)
-  }
 
   /**
    * Spies the specified object only for the context of the block
@@ -661,8 +660,13 @@ trait LeniencySettings {
 }
 
 object LeniencySettings {
-  implicit val strictStubs: LeniencySettings = identity
-  val lenientStubs: LeniencySettings = _.lenient()
+  implicit val strictStubs: LeniencySettings = new LeniencySettings {
+    override def apply(settings: MockSettings): MockSettings = settings
+  }
+
+  val lenientStubs: LeniencySettings = new LeniencySettings {
+    override def apply(settings: MockSettings): MockSettings = settings.lenient()
+  }
 }
 
 private[mockito] trait Verifications {

scalatest/src/test/scala/user/org/mockito/IdiomaticStubbingTest.scala

@@ -3,15 +3,15 @@ package user.org.mockito
 import java.util.concurrent.atomic.AtomicInteger
 
 import org.mockito.invocation.InvocationOnMock
-import org.mockito.{ArgumentMatchersSugar, IdiomaticStubbing}
+import org.mockito.{ ArgumentMatchersSugar, IdiomaticStubbing }
 import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpec
-import user.org.mockito.matchers.{ValueCaseClassInt, ValueCaseClassString, ValueClass}
+import user.org.mockito.matchers.{ ValueCaseClassInt, ValueCaseClassString, ValueClass }
 import scala.collection.parallel.immutable
-import scala.concurrent.{Await, Future}
+import scala.concurrent.{ Await, Future }
 import scala.util.Random
 
-class IdiomaticStubbingTest extends AnyWordSpec with Matchers with ArgumentMatchersSugar with IdiomaticMockitoTestSetup with IdiomaticStubbing{
+class IdiomaticStubbingTest extends AnyWordSpec with Matchers with ArgumentMatchersSugar with IdiomaticMockitoTestSetup with IdiomaticStubbing {
 
   forAll(scenarios) { (testDouble, orgDouble, foo) =>
     testDouble should {
@@ -295,7 +295,6 @@ class IdiomaticStubbingTest extends AnyWordSpec with Matchers with ArgumentMatch
       org.doSomethingWithThisIntAndStringAndBoolean(1, "2", v3 = false) shouldBe ""
     }
 
-
     "stub an object method" in {
       FooObject.simpleMethod shouldBe "not mocked!"