Skip to content

Commit

Permalink
Remove 2.11 specific files, move FutureCompat
Browse files Browse the repository at this point in the history
  • Loading branch information
valencik authored and tgodzik committed Dec 13, 2023
1 parent c32a10c commit e2523f3
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 38 deletions.
10 changes: 1 addition & 9 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ val scala2Versions = List(scala213, scala212)
val scala3Versions = List(scala3)
val allScalaVersions = scala2Versions ++ scala3Versions

def isNotScala211(v: Option[(Long, Long)]): Boolean = !v.contains((2, 11))
def isScala2(v: Option[(Long, Long)]): Boolean = v.exists(_._1 == 2)
val isScala3Setting = Def.setting {
isScala3(CrossVersion.partialVersion(scalaVersion.value))
Expand Down Expand Up @@ -278,11 +277,7 @@ lazy val munitScalacheck = crossProject(JSPlatform, JVMPlatform, NativePlatform)
moduleName := "munit-scalacheck",
sharedSettings,
libraryDependencies += {
val partialVersion = CrossVersion.partialVersion(scalaVersion.value)
if (isNotScala211(partialVersion))
"org.scalacheck" %%% "scalacheck" % "1.17.0"
else
"org.scalacheck" %%% "scalacheck" % "1.15.2"
"org.scalacheck" %%% "scalacheck" % "1.17.0"
}
)
.jvmSettings(
Expand Down Expand Up @@ -373,9 +368,6 @@ def crossBuildingDirectories(name: String, config: String) =
if (isPreScala213(partialVersion)) {
result += base / "scala-pre-2.13"
}
if (isNotScala211(partialVersion)) {
result += base / "scala-post-2.11"
}
if (isScala2(partialVersion)) {
result += base / "scala-2"
}
Expand Down
29 changes: 0 additions & 29 deletions munit/shared/src/main/scala-2.11/munit/internal/FutureCompat.scala

This file was deleted.

0 comments on commit e2523f3

Please sign in to comment.