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.

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

Drop Support for Scala 2.11 #723

Merged
merged 3 commits into from
Dec 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 0 additions & 6 deletions bin/test-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,18 @@ argumentsRest=${@:2}
suffix=${argumentsRest:-}

coursier resolve \
org.scalameta:munit_2.11:$version \
org.scalameta:munit_2.12:$version \
org.scalameta:munit_2.13:$version \
org.scalameta:munit_3.0.0:$version \
org.scalameta:munit_native0.4_2.11:$version \
org.scalameta:munit_native0.4_2.12:$version \
org.scalameta:munit_native0.4_2.13:$version \
org.scalameta:munit_sjs1_2.11:$version \
org.scalameta:munit_sjs1_2.12:$version \
org.scalameta:munit_sjs1_2.13:$version \
org.scalameta:munit-scalacheck_2.11:$version \
org.scalameta:munit-scalacheck_2.12:$version \
org.scalameta:munit-scalacheck_2.13:$version \
org.scalameta:munit-scalacheck_3.0.0:$version \
org.scalameta:munit-scalacheck_native0.4_2.11:$version \
org.scalameta:munit-scalacheck_native0.4_2.12:$version \
org.scalameta:munit-scalacheck_native0.4_2.13:$version \
org.scalameta:munit-scalacheck_sjs1_2.11:$version \
org.scalameta:munit-scalacheck_sjs1_2.12:$version \
org.scalameta:munit-scalacheck_sjs1_2.13:$version \
org.scalameta:munit-docs_2.12:$version \
Expand Down
15 changes: 3 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ def scala213 = "2.13.12"

def scala212 = "2.12.18"

def scala211 = "2.11.12"
def scala3 = "3.1.2"
def junitVersion = "4.13.2"
def gcp = "com.google.cloud" % "google-cloud-storage" % "2.26.1"
Expand Down Expand Up @@ -51,12 +50,11 @@ addCommandAlias(
s"; ++$scala212 ; scalafixEnable ; scalafix --check ; test:scalafix --check"
)
val isPreScala213 = Set[Option[(Long, Long)]](Some((2, 11)), Some((2, 12)))
val scala2Versions = List(scala213, scala212, scala211)
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 @@ -163,7 +161,7 @@ val sharedJSConfigure: Project => Project =

val sharedNativeSettings: List[Def.Setting[_]] = List(
skipIdeaSettings,
crossScalaVersions := allScalaVersions.filterNot(_ == scala211)
crossScalaVersions := allScalaVersions
)
val sharedNativeConfigure: Project => Project =
_.disablePlugins(ScalafixPlugin, MimaPlugin)
Expand Down Expand Up @@ -279,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 @@ -374,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.