Merge pull request #236 from cucumber/drop-scala-211

Drop support for Scala 2.11

Author: gaeljw

CHANGELOG.md

@@ -23,6 +23,7 @@ Check out the [Upgrade Guide](docs/upgrade_v8.md).
 
 ### Removed
 
+- [Scala] Remove support for Scala 2.11
 - [Core] Remove deprecated `io.cucumber.scala.TL`
 
 ### Fixed

README.md

@@ -21,7 +21,7 @@ The table below shows the compatible versions:
 
 | Cucumber Scala version | Cucumber Core version | Scala versions        |
 |------------------------|-----------------------|-----------------------|
-| 8.x                    | 7.x                   | 2.11, 2.12, 2.13, 3.0 |
+| 8.x                    | 7.x                   | 2.12, 2.13, 3.0       |
 | 7.x                    | 6.x                   | 2.11, 2.12, 2.13, 3.0 |
 | 6.x                    | 6.x                   | 2.11, 2.12, 2.13      |
 | 5.x                    | 5.x                   | 2.11, 2.12, 2.13      |

build.sbt

@@ -30,7 +30,6 @@ ThisBuild / homepage := Some(
 
 // Scala versions
 
-val scala211 = "2.11.12"
 val scala212 = "2.12.13"
 val scala213 = "2.13.5"
 val scala3 = "3.0.0"
@@ -50,7 +49,6 @@ lazy val commonSettings = Seq(
   libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test,
   scalacOptions ++= {
     CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, 11)) => ScalacOptions.scalacOptions211
       case Some((2, 12)) => ScalacOptions.scalacOptions212
       case Some((2, 13)) => ScalacOptions.scalacOptions213
       case Some((3, 0))  => ScalacOptions.scalacOptions3
@@ -86,17 +84,15 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
     ),
     libraryDependencies ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((2, n)) if n <= 12 =>
+        case Some((2, n)) if n == 12 =>
           List("org.scala-lang.modules" %% "scala-collection-compat" % "2.4.4")
         case _ => Nil
       }
     },
     Compile / unmanagedSourceDirectories ++= {
       val sourceDir = (Compile / sourceDirectory).value
       CrossVersion.partialVersion(scalaVersion.value) match {
-        case Some((2, n)) if n <= 11 =>
-          Seq(sourceDir / "scala-2", sourceDir / "scala-2.11")
-        case Some((2, n)) if n > 11 =>
+        case Some((2, n)) =>
           Seq(sourceDir / "scala-2")
         case Some((3, 0)) =>
           Seq(sourceDir / "scala-3")
@@ -123,7 +119,7 @@ lazy val cucumberScala = (projectMatrix in file("cucumber-scala"))
       Seq(file)
     }.taskValue
   )
-  .jvmPlatform(scalaVersions = Seq(scala3, scala213, scala212, scala211))
+  .jvmPlatform(scalaVersions = Seq(scala3, scala213, scala212))
 
 // Examples project
 lazy val examples = (projectMatrix in file("examples"))

cucumber-scala/src/main/scala-2.11/io/cucumber/scala/package.scala

@@ -23,7 +23,6 @@ class ScalaBackendTest {
   private val fakeLookup: Lookup = mock(classOf[Lookup])
   private val fakeContainer: Container = mock(classOf[Container])
 
-  // Note: keep unnecessary "new" for Scala 2.11 compat
   private val classLoaderSupplier: Supplier[ClassLoader] = () =>
     Thread.currentThread().getContextClassLoader
 

cucumber-scala/src/test/scala/io/cucumber/scala/ScalaBackendTest.scala

@@ -66,14 +66,4 @@ object ScalacOptions {
     "-language:higherKinds" // Allow higher-kinded types
   )
 
-  val scalacOptions211 = Seq(
-    "-deprecation",
-    "-encoding",
-    "UTF-8", // yes, this is 2 args
-    "-feature",
-    "-language:implicitConversions",
-    "-language:higherKinds", // Allow higher-kinded types
-    "-target:jvm-1.8"
-  )
-
 }