drop Scala 2.11

scalate · May 12, 2024 · 1697f2c · 1697f2c
1 parent 8f86a85
commit 1697f2c
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 262 deletions.
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         java: [8, 11]
-        scala: ['2_11', '2_12', '2_13', '3']
+        scala: ['2_12', '2_13', '3']
 
     steps:
     - uses: actions/checkout@v4
@@ -26,9 +26,6 @@ jobs:
     - name: Run tests
       run: |
         case ${{ matrix.scala }} in
-          "2_11")
-            sbt -v SetScala211 test unidoc
-            ;;
           "2_12")
             sbt -v SetScala212 test unidoc
             ;;

diff --git a/build.sbt b/build.sbt
@@ -8,12 +8,10 @@ import com.typesafe.tools.mima.core._
 // Scalate project guarantees bin-compatibities for only core, util
 // -----------------------------------------------------------------------------------
 
-def Scala211 = "2.11.12"
 def Scala212 = "2.12.19"
 def Scala213 = "2.13.14"
 def Scala3 = "3.3.3"
 
-addCommandAlias("SetScala211", s"++ ${Scala211}!")
 addCommandAlias("SetScala212", s"++ ${Scala212}!")
 addCommandAlias("SetScala213", s"++ ${Scala213}!")
 addCommandAlias("SetScala3", s"++ ${Scala3}!")
@@ -22,7 +20,7 @@ name := "scalate"
 organization := "org.scalatra.scalate"
 version := "1.10.1"
 scalaVersion := Scala213
-crossScalaVersions := Seq(Scala3, Scala213, Scala212, Scala211)
+crossScalaVersions := Seq(Scala3, Scala213, Scala212)
 javacOptions ++= Seq("-source", "1.8")
 scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature")
 startYear := Some(2010)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -5,20 +5,11 @@ import sbt._
 object Dependencies {
 
   val scalaParserCombinators = Def.setting(
-    if (scalaBinaryVersion.value == "2.11") {
-      "org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1"
-    } else {
-      "org.scala-lang.modules" %% "scala-parser-combinators" % "2.4.0"
-    }
+    "org.scala-lang.modules" %% "scala-parser-combinators" % "2.4.0"
   )
 
   val scalaXml = Def.setting(
-    CrossVersion.partialVersion(scalaVersion.value) match {
-      case Some((2, 11)) =>
-        "org.scala-lang.modules" %% "scala-xml" % "1.3.1"
-      case _ =>
-        "org.scala-lang.modules" %% "scala-xml" % "2.3.0"
-    }
+    "org.scala-lang.modules" %% "scala-xml" % "2.3.0"
   )
 
   val scalaCompiler = Def.setting(

diff --git a/scalate-core/src/main/scala_2.11/org/fusesource/scalate/japi/Converter.java b/scalate-core/src/main/scala_2.11/org/fusesource/scalate/japi/Converter.java
diff --git a/scalate-core/src/main/scala_2.11/org/fusesource/scalate/support/ScalaCompiler.scala b/scalate-core/src/main/scala_2.11/org/fusesource/scalate/support/ScalaCompiler.scala
diff --git a/scalate-core/src/test/scala/org/fusesource/scalate/scaml/ScamlTemplateErrorTest.scala b/scalate-core/src/test/scala/org/fusesource/scalate/scaml/ScamlTemplateErrorTest.scala
@@ -23,18 +23,7 @@ package org.fusesource.scalate.scaml
 class ScamlTemplateErrorTest extends ScamlTestSupport {
   val scalaV = org.fusesource.scalate.buildinfo.BuildInfo.scalaVersion
 
-  if (scalaV.startsWith("2.11")) {
-    testCompilerException(
-      "Compile Error",
-      """
-%html
-  %body
-    %ul
-      - for (i <- unknown)
-        %li= i
-""",
-      "error: not found: value unknown")
-  } else if (scalaV.startsWith("3")) {
+  if (scalaV.startsWith("3")) {
     testCompilerException(
       "Compile Error",
       """