From 94633c2574dacaada824ffaecea7912004796115 Mon Sep 17 00:00:00 2001 From: Andrew Valencik Date: Tue, 12 Dec 2023 19:02:23 -0500 Subject: [PATCH 1/3] Drop 2.11 from build.sbt --- build.sbt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 825d7758..cf10fd32 100644 --- a/build.sbt +++ b/build.sbt @@ -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" @@ -51,7 +50,7 @@ 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 @@ -163,7 +162,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) From 2f9972559a2bde01e218c9146d4340202953c3fe Mon Sep 17 00:00:00 2001 From: Andrew Valencik Date: Tue, 12 Dec 2023 19:12:41 -0500 Subject: [PATCH 2/3] Drop 2.11 from test-release.sh --- bin/test-release.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bin/test-release.sh b/bin/test-release.sh index 92f4657c..74adf9ce 100755 --- a/bin/test-release.sh +++ b/bin/test-release.sh @@ -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 \ From 15df018d783cf6df9cf6df3bce8759c781396925 Mon Sep 17 00:00:00 2001 From: Andrew Valencik Date: Tue, 12 Dec 2023 19:53:30 -0500 Subject: [PATCH 3/3] Remove 2.11 specific files, move FutureCompat --- build.sbt | 10 +------ .../munit/internal/FutureCompat.scala | 29 ------------------- .../munit/internal/FutureCompat.scala | 0 3 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 munit/shared/src/main/scala-2.11/munit/internal/FutureCompat.scala rename munit/shared/src/main/{scala-post-2.11 => scala}/munit/internal/FutureCompat.scala (100%) diff --git a/build.sbt b/build.sbt index cf10fd32..5b73358d 100644 --- a/build.sbt +++ b/build.sbt @@ -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)) @@ -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( @@ -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" } diff --git a/munit/shared/src/main/scala-2.11/munit/internal/FutureCompat.scala b/munit/shared/src/main/scala-2.11/munit/internal/FutureCompat.scala deleted file mode 100644 index 5dba98fe..00000000 --- a/munit/shared/src/main/scala-2.11/munit/internal/FutureCompat.scala +++ /dev/null @@ -1,29 +0,0 @@ -package munit.internal - -import scala.concurrent.Future -import scala.util.Try -import scala.concurrent.ExecutionContext -import scala.concurrent.Promise - -object FutureCompat { - implicit class ExtensionFuture[T](f: Future[T]) { - def flattenCompat[S]( - ec: ExecutionContext - )(implicit ev: T <:< Future[S]): Future[S] = - f.flatMap(ev)(ec) - def transformCompat[B]( - fn: Try[T] => Try[B] - )(implicit ec: ExecutionContext): Future[B] = { - val p = Promise[B]() - f.onComplete { t => p.complete(fn(t)) } - p.future - } - def transformWithCompat[B]( - fn: Try[T] => Future[B] - )(implicit ec: ExecutionContext): Future[B] = { - val p = Promise[B]() - f.onComplete { t => p.completeWith(fn(t)) } - p.future - } - } -} diff --git a/munit/shared/src/main/scala-post-2.11/munit/internal/FutureCompat.scala b/munit/shared/src/main/scala/munit/internal/FutureCompat.scala similarity index 100% rename from munit/shared/src/main/scala-post-2.11/munit/internal/FutureCompat.scala rename to munit/shared/src/main/scala/munit/internal/FutureCompat.scala