diff --git a/common/src/main/scala/org/mockito/stubbing/ReturnsSmartNulls.scala b/common/src/main/scala/org/mockito/stubbing/ReturnsSmartNulls.scala index 998adcf3..5ac312aa 100644 --- a/common/src/main/scala/org/mockito/stubbing/ReturnsSmartNulls.scala +++ b/common/src/main/scala/org/mockito/stubbing/ReturnsSmartNulls.scala @@ -1,9 +1,8 @@ package org.mockito package stubbing import java.lang.reflect.Modifier.isFinal - import org.mockito.Mockito.{ mock, withSettings } -import org.mockito.internal.debugging.LocationImpl +import org.mockito.internal.debugging.LocationFactory import org.mockito.internal.exceptions.Reporter.smartNullPointerException import org.mockito.internal.stubbing.defaultanswers.ReturnsMoreEmptyValues import org.mockito.internal.util.ObjectMethodsGuru.isToStringMethod @@ -22,7 +21,7 @@ object ReturnsSmartNulls extends DefaultAnswer { None } - case class ThrowsSmartNullPointer(unstubbedInvocation: InvocationOnMock, location: Location = new LocationImpl) extends Answer[AnyRef] { + case class ThrowsSmartNullPointer(unstubbedInvocation: InvocationOnMock, location: Location = LocationFactory.create()) extends Answer[AnyRef] { override def answer(invocation: InvocationOnMock): AnyRef = if (isToStringMethod(invocation.getMethod)) s"""SmartNull returned by this unstubbed method call on a mock: diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 1bb74080..a09676e9 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ object Dependencies { val scalatestVersion = "3.2.13" val commonLibraries = Seq( - "org.mockito" % "mockito-core" % "4.6.1", + "org.mockito" % "mockito-core" % "4.8.1", "org.scalactic" %% "scalactic" % scalatestVersion, "ru.vyarus" % "generics-resolver" % "3.0.3" )