Drop support for 2.13.0 and 2.13.1

fastparse doesn't support it anymore
com-lihaoyi · Nov 15, 2023 · c0bcfe4 · c0bcfe4
1 parent 7cbbff0
commit c0bcfe4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/amm/interp/src/main/scala/ammonite/interp/Interpreter.scala b/amm/interp/src/main/scala/ammonite/interp/Interpreter.scala
@@ -214,11 +214,6 @@ class Interpreter(val compilerBuilder: CompilerBuilder,
                          source: CodeSource,
                          wrapperPath: Seq[Name]): Res[ImportHookInfo] = synchronized{
 
-    // Fake an update to the classpath to force re-creation of the compiler
-    // Workaround for https://github.com/scala/bug/issues/11564#issuecomment-501834821,
-    // which I caused in 2.13.0 and should be fixed in 2.13.1
-    if (scala.util.Properties.versionNumberString == "2.13.0") headFrame.addClasspath(Nil)
-
     for (hookImports <- Res.map(importTrees)(resolveSingleImportHook(source, _, wrapperPath)))
     yield ImportHookInfo(
       Imports(hookImports.flatten.flatMap(_.value)),

diff --git a/amm/repl/src/test/scala/ammonite/session/AdvancedTests.scala b/amm/repl/src/test/scala/ammonite/session/AdvancedTests.scala
@@ -477,8 +477,7 @@ object AdvancedTests extends TestSuite{
 
     test("dontRefreshCompiler"){
       test{
-        // Conditional check due to https://github.com/scala/bug/issues/11564
-        if (scala.util.Properties.versionNumberString != "2.13.0") check.session("""
+        check.session("""
           @ val c1 = repl.compiler
 
           @ val n = 2
@@ -498,8 +497,7 @@ object AdvancedTests extends TestSuite{
       }
 
       test("preconfigured"){
-        // Conditional check due to https://github.com/scala/bug/issues/11564
-        if (scala.util.Properties.versionNumberString != "2.13.0") check.session("""
+        check.session("""
           @ val c0 = repl.compiler
 
           @ interp.preConfigureCompiler(_ => ())

diff --git a/build.sc b/build.sc
@@ -34,14 +34,14 @@ val commitsSinceTaggedVersion = {
 }
 
 val scala2_12Versions = Seq("2.12.8", "2.12.9", "2.12.10", "2.12.11", "2.12.12", "2.12.13", "2.12.14", "2.12.15", "2.12.16", "2.12.17", "2.12.18")
-val scala2_13Versions = Seq("2.13.0", "2.13.1", "2.13.2", "2.13.3", "2.13.4", "2.13.5", "2.13.6", "2.13.7", "2.13.8", "2.13.9", "2.13.10", "2.13.11", "2.13.12")
+val scala2_13Versions = Seq("2.13.2", "2.13.3", "2.13.4", "2.13.5", "2.13.6", "2.13.7", "2.13.8", "2.13.9", "2.13.10", "2.13.11", "2.13.12")
 val scala32Versions = Seq("3.2.0", "3.2.1", "3.2.2")
 val scala33Versions = Seq("3.3.0", "3.3.1")
 val scala3Versions = scala32Versions ++ scala33Versions
 
 val binCrossScalaVersions = Seq(scala2_12Versions.last, scala2_13Versions.last, scala32Versions.last, scala33Versions.last)
 def isScala2_12_10OrLater(sv: String): Boolean = {
-  (sv.startsWith("2.12.") && sv.stripPrefix("2.12.").length > 1) || (sv.startsWith("2.13.") && sv != "2.13.0")
+  (sv.startsWith("2.12.") && sv.stripPrefix("2.12.").length > 1) || sv.startsWith("2.13.")
 }
 val fullCrossScalaVersions = scala2_12Versions ++ scala2_13Versions ++ scala3Versions