scala-js · sjrd · Jan 5, 2025 · Jan 5, 2025
diff --git a/CODINGSTYLE.md b/CODINGSTYLE.md
@@ -227,7 +227,7 @@ value :: list
 ```
 
 When calling a method declared with an empty pair of parentheses, always use `()`.
-Not doing so causes (fatal) warnings when calling Scala-declared methods in Scala 2.13.3+.
+Not doing so causes (fatal) warnings when calling Scala-declared methods in Scala 2.13.x.
 For consistency, we also apply this rule to all Java-defined methods, including `toString()`.
 
 ### Method definition

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -559,9 +559,6 @@ def otherScalaVersions = [
   "2.12.16",
   "2.12.17",
   "2.12.18",
-  "2.13.0",
-  "2.13.1",
-  "2.13.2",
   "2.13.3",
   "2.13.4",
   "2.13.5",

diff --git a/compiler/src/main/scala/org/scalajs/nscplugin/GenJSCode.scala b/compiler/src/main/scala/org/scalajs/nscplugin/GenJSCode.scala
@@ -3875,7 +3875,7 @@ abstract class GenJSCode[G <: Global with Singleton](val global: G)
        * true `int`s can reach the back-end, as asserted by the String-switch
        * transformation in `cleanup`. Therefore, we do not adapt, preserving
        * the `string`s and `null`s that come out of the pattern matching in
-       * Scala 2.13.2+.
+       * Scala 2.13.x.
        */
       val genSelector = genExpr(selector)
 

diff --git a/compiler/src/test/scala/org/scalajs/nscplugin/test/DiverseErrorsTest.scala b/compiler/src/test/scala/org/scalajs/nscplugin/test/DiverseErrorsTest.scala
@@ -26,13 +26,8 @@ class DiverseErrorsTest extends DirectTest with TestHelpers  {
 
   private def version = scala.util.Properties.versionNumberString
 
-  private val allowsSingletonClassOf = (
-      !version.startsWith("2.12.") &&
-      version != "2.13.0" &&
-      version != "2.13.1" &&
-      version != "2.13.2" &&
-      version != "2.13.3"
-  )
+  private val allowsSingletonClassOf =
+    !version.startsWith("2.12.") && version != "2.13.3"
 
   @Test
   def noIsInstanceOnJS(): Unit = {

diff --git a/compiler/src/test/scala/org/scalajs/nscplugin/test/JSInteropTest.scala b/compiler/src/test/scala/org/scalajs/nscplugin/test/JSInteropTest.scala
@@ -4423,9 +4423,7 @@ class JSInteropTest extends DirectTest with TestHelpers {
         version == "2.12.7" ||
         version == "2.12.8" ||
         version == "2.12.9" ||
-        version == "2.12.10" ||
-        version == "2.13.0" ||
-        version == "2.13.1"
+        version == "2.12.10"
       }
       if (hasNoSpace) ""
       else " "

diff --git a/compiler/src/test/scala/org/scalajs/nscplugin/test/util/VersionDependentUtils.scala b/compiler/src/test/scala/org/scalajs/nscplugin/test/util/VersionDependentUtils.scala
@@ -15,23 +15,12 @@ package org.scalajs.nscplugin.test.util
 object VersionDependentUtils {
   val scalaVersion = scala.util.Properties.versionNumberString
 
-  /** Does the current Scala version support the `@nowarn` annotation? */
-  val scalaSupportsNoWarn = {
-    !scalaVersion.startsWith("2.12.") &&
-    scalaVersion != "2.13.0" &&
-    scalaVersion != "2.13.1"
-  }
+  private val isScala212 = scalaVersion.startsWith("2.12.")
 
-  private val usesColonInMethodSig = {
-    /* Yes, this is the same test as in scalaSupportsNoWarn, but that's
-     * completely coincidental, so we have a copy.
-     */
-    !scalaVersion.startsWith("2.12.") &&
-    scalaVersion != "2.13.0" &&
-    scalaVersion != "2.13.1"
-  }
+  /** Does the current Scala version support the `@nowarn` annotation? */
+  val scalaSupportsNoWarn = !isScala212
 
   def methodSig(params: String, resultType: String): String =
-    if (usesColonInMethodSig) params + ": " + resultType
+    if (!isScala212) params + ": " + resultType
     else params + resultType
 }
diff --git a/project/Build.scala b/project/Build.scala
@@ -484,12 +484,7 @@ object Build {
 
   def addWconfSettingIf2_13(conf: String): Def.Setting[_] = {
     scalacOptions ++= {
-      /* We exclude 2.13.0 and 2.13.1 because they did not support -Wconf yet.
-       * Fortunately, our use cases for -Wconf are only triggered with later
-       * versions.
-       */
-      val v = scalaVersion.value
-      if (v.startsWith("2.13.") && v != "2.13.0" && v != "2.13.1")
+      if (scalaVersion.value.startsWith("2.13."))
         List("-Wconf:" + conf)
       else
         Nil
@@ -739,12 +734,7 @@ object Build {
 
       scalacOptions in (Compile, doc) := {
         val prev = (scalacOptions in (Compile, doc)).value
-        val scalaV = scalaVersion.value
-        def scaladocFullySupportsJDKgreaterThan8 = {
-          !scalaV.startsWith("2.12.") &&
-          scalaV != "2.13.0" && scalaV != "2.13.1" && scalaV != "2.13.2"
-        }
-        if (javaVersion.value > 8 && !scaladocFullySupportsJDKgreaterThan8)
+        if (javaVersion.value > 8 && scalaVersion.value.startsWith("2.12."))
           prev.filter(_ != "-Xfatal-warnings")
         else
           prev
@@ -966,9 +956,6 @@ object Build {
         "2.12.19",
       ),
       cross213ScalaVersions := Seq(
-        "2.13.0",
-        "2.13.1",
-        "2.13.2",
         "2.13.3",
         "2.13.4",
         "2.13.5",

diff --git a/scala-test-suite/src/test/resources/2.13.0/BlacklistedTests.txt b/scala-test-suite/src/test/resources/2.13.0/BlacklistedTests.txt