mockito
diff --git a/‎build.sbt‎
Lines changed: 10 additions & 2 deletions b/‎build.sbt‎
Lines changed: 10 additions & 2 deletions
diff --git a/‎…g/mockito/internal/handler/package.scala‎ ‎…g/mockito/internal/handler/package.scala‎common/src/main/scala-2.13/org/mockito/internal/handler/package.scala renamed to common/src/main/scala-2.13+/org/mockito/internal/handler/package.scala b/‎…g/mockito/internal/handler/package.scala‎ ‎…g/mockito/internal/handler/package.scala‎common/src/main/scala-2.13/org/mockito/internal/handler/package.scala renamed to common/src/main/scala-2.13+/org/mockito/internal/handler/package.scala
diff --git a/‎…ockito/stubbing/ReturnsEmptyValues.scala‎ ‎…ockito/stubbing/ReturnsEmptyValues.scala‎common/src/main/scala-2.13/org/mockito/stubbing/ReturnsEmptyValues.scala renamed to common/src/main/scala-2.13+/org/mockito/stubbing/ReturnsEmptyValues.scala b/‎…ockito/stubbing/ReturnsEmptyValues.scala‎ ‎…ockito/stubbing/ReturnsEmptyValues.scala‎common/src/main/scala-2.13/org/mockito/stubbing/ReturnsEmptyValues.scala renamed to common/src/main/scala-2.13+/org/mockito/stubbing/ReturnsEmptyValues.scala
diff --git a/‎…g/mockito/IdiomaticMockitoTest_213.scala‎ ‎…g/mockito/IdiomaticMockitoTest_213.scala‎scalatest/src/test/scala-2.13/user/org/mockito/IdiomaticMockitoTest_213.scala renamed to scalatest/src/test/scala-2.13+/user/org/mockito/IdiomaticMockitoTest_213.scala b/‎…g/mockito/IdiomaticMockitoTest_213.scala‎ ‎…g/mockito/IdiomaticMockitoTest_213.scala‎scalatest/src/test/scala-2.13/user/org/mockito/IdiomaticMockitoTest_213.scala renamed to scalatest/src/test/scala-2.13+/user/org/mockito/IdiomaticMockitoTest_213.scala
diff --git a/‎…2.13/user/org/mockito/Issue352_213.scala‎ ‎….13+/user/org/mockito/Issue352_213.scala‎scalatest/src/test/scala-2.13/user/org/mockito/Issue352_213.scala renamed to scalatest/src/test/scala-2.13+/user/org/mockito/Issue352_213.scala b/‎…2.13/user/org/mockito/Issue352_213.scala‎ ‎….13+/user/org/mockito/Issue352_213.scala‎scalatest/src/test/scala-2.13/user/org/mockito/Issue352_213.scala renamed to scalatest/src/test/scala-2.13+/user/org/mockito/Issue352_213.scala
diff --git a/‎…r/org/mockito/MockitoSugarTest_213.scala‎ ‎…r/org/mockito/MockitoSugarTest_213.scala‎scalatest/src/test/scala-2.13/user/org/mockito/MockitoSugarTest_213.scala renamed to scalatest/src/test/scala-2.13+/user/org/mockito/MockitoSugarTest_213.scala b/‎…r/org/mockito/MockitoSugarTest_213.scala‎ ‎…r/org/mockito/MockitoSugarTest_213.scala‎scalatest/src/test/scala-2.13/user/org/mockito/MockitoSugarTest_213.scala renamed to scalatest/src/test/scala-2.13+/user/org/mockito/MockitoSugarTest_213.scala
diff --git a/‎…test/AsyncIdiomaticMockitoTest_213.scala‎ ‎…test/AsyncIdiomaticMockitoTest_213.scala‎scalatest/src/test/scala-2.13/user/org/mockito/scalatest/AsyncIdiomaticMockitoTest_213.scala renamed to scalatest/src/test/scala-2.13+/user/org/mockito/scalatest/AsyncIdiomaticMockitoTest_213.scala b/‎…test/AsyncIdiomaticMockitoTest_213.scala‎ ‎…test/AsyncIdiomaticMockitoTest_213.scala‎scalatest/src/test/scala-2.13/user/org/mockito/scalatest/AsyncIdiomaticMockitoTest_213.scala renamed to scalatest/src/test/scala-2.13+/user/org/mockito/scalatest/AsyncIdiomaticMockitoTest_213.scala
diff --git a/‎…to/stubbing/ReturnsEmptyValuesTest.scala‎ ‎…to/stubbing/ReturnsEmptyValuesTest.scala‎scalatest/src/test/scala-2.13/user/org/mockito/stubbing/ReturnsEmptyValuesTest.scala renamed to scalatest/src/test/scala-2.13+/user/org/mockito/stubbing/ReturnsEmptyValuesTest.scala b/‎…to/stubbing/ReturnsEmptyValuesTest.scala‎ ‎…to/stubbing/ReturnsEmptyValuesTest.scala‎scalatest/src/test/scala-2.13/user/org/mockito/stubbing/ReturnsEmptyValuesTest.scala renamed to scalatest/src/test/scala-2.13+/user/org/mockito/stubbing/ReturnsEmptyValuesTest.scala
@@ -10,6 +10,12 @@ inThisBuild(
   )
 )
 
+def scala213PlusSourceDirectory(baseDir: File, sourceScope: String, scalaV: String): Seq[File] =
+  CrossVersion.partialVersion(scalaV) match {
+    case Some((2, 13)) | Some((3, _)) => Seq(baseDir / "src" / sourceScope / "scala-2.13+")
+    case _                             => Seq.empty
+  }
+
 lazy val commonSettings =
   Seq(
     organization := "org.mockito",
@@ -43,10 +49,12 @@ lazy val commonSettings =
         case Some((2, major)) if major <= 12 =>
           Seq()
         case _ =>
-          Seq("org.scala-lang.modules" %% "scala-parallel-collections" % "1.2.0")
+          Seq(Dependencies.scalaParallelCollections)
       }
     },
-    libraryDependencies += "org.scala-lang.modules" %% "scala-collection-compat" % "2.13.0"
+    libraryDependencies += Dependencies.scalaCollectionCompat,
+    Compile / unmanagedSourceDirectories ++= scala213PlusSourceDirectory(baseDirectory.value, "main", scalaVersion.value),
+    Test / unmanagedSourceDirectories ++= scala213PlusSourceDirectory(baseDirectory.value, "test", scalaVersion.value)
   )
 
 lazy val publishSettings = Seq(