Merge pull request scala-js#3806 from sjrd/drop-old-2.11-versions

Drop support for old 2.11.x versions.

Author: gzm0

Jenkinsfile

@@ -420,15 +420,6 @@ allJavaVersions << mainJavaVersion
 def mainScalaVersion = "2.12.8"
 def mainScalaVersions = ["2.11.12", "2.12.8", "2.13.0"]
 def otherScalaVersions = [
-  "2.11.0",
-  "2.11.1",
-  "2.11.2",
-  "2.11.4",
-  "2.11.5",
-  "2.11.6",
-  "2.11.7",
-  "2.11.8",
-  "2.11.11",
   "2.11.12",
   "2.12.1",
   "2.12.2",
@@ -457,7 +448,7 @@ allJavaVersions.each { javaVersion ->
   quickMatrix.add([task: "tools-sbtplugin", scala: "2.12.8", java: javaVersion])
   quickMatrix.add([task: "tools", scala: "2.11.12", java: javaVersion])
 }
-quickMatrix.add([task: "partestc", scala: "2.11.0", java: mainJavaVersion])
+quickMatrix.add([task: "partestc", scala: "2.12.1", java: mainJavaVersion])
 quickMatrix.add([task: "sbtplugin-test", toolsscala: "2.12.8", java: mainJavaVersion])
 
 // The 'full' matrix
@@ -474,10 +465,7 @@ mainScalaVersions.each { scalaVersion ->
   fullMatrix.add([task: "partest-fullopt", scala: scalaVersion, java: mainJavaVersion])
 }
 otherScalaVersions.each { scalaVersion ->
-  // Partest does not compile on Scala 2.11.4 (see #1215).
-  if (scalaVersion != "2.11.4") {
-    fullMatrix.add([task: "partest-fastopt", scala: scalaVersion, java: mainJavaVersion])
-  }
+  fullMatrix.add([task: "partest-fastopt", scala: scalaVersion, java: mainJavaVersion])
 }
 
 def Matrices = [

ci/checksizes.sh

@@ -14,7 +14,7 @@ case $FULLVER in
   2.13.0)
     VER=2.13
     ;;
-  2.11.0|2.11.1|2.11.2|2.11.4|2.11.5|2.11.6|2.11.7|2.11.8|2.11.11|2.12.1|2.12.2|2.12.3|2.12.4|2.12.5|2.12.6|2.12.7)
+  2.12.1|2.12.2|2.12.3|2.12.4|2.12.5|2.12.6|2.12.7)
     echo "Ignoring checksizes for Scala $FULLVER"
     exit 0
     ;;

compiler/src/main/scala/org/scalajs/nscplugin/CompatComponent.scala

@@ -97,38 +97,12 @@ trait CompatComponent {
   }
 
   /* global.genBCode.bTypes.initializeCoreBTypes()
-   *
-   * This one has a very particular history:
-   * - in 2.11.{0-1}, genBCode does not have a bTypes member
-   * - In 2.11.{2-5}, there is genBCode.bTypes, but it has no
-   *   initializeCoreBTypes (it was actually typo'ed as intializeCoreBTypes!)
-   * - In 2.11.6+, including 2.12, we finally have
-   *   genBCode.bTypes.initializeCoreBTypes
-   * - Since 2.12, it is mandatory to call that method from GenJSCode.run()
+   * Early 2.12.x versions require that this method be called from
+   * GenJSCode.run(), but it disappeared later in the 2.12.x series.
    */
 
-  object LowPrioGenBCodeCompat {
-    object genBCode {
-      object bTypes {
-        def initializeCoreBTypes(): Unit = ()
-      }
-    }
-  }
-
-  def initializeCoreBTypesCompat(): Unit = {
-    import LowPrioGenBCodeCompat.genBCode._
-
-    {
-      import genBCode._
-
-      import LowPrioGenBCodeCompat.genBCode.bTypes._
-
-      {
-        import bTypes._
-
-        initializeCoreBTypes()
-      }
-    }
+  implicit class BTypesCompat(bTypes: genBCode.bTypes.type) {
+    def initializeCoreBTypes(): Unit = ()
   }
 }
 

compiler/src/main/scala/org/scalajs/nscplugin/GenJSCode.scala

@@ -233,7 +233,7 @@ abstract class GenJSCode[G <: Global with Singleton](val global: G)
 
     override def run(): Unit = {
       scalaPrimitives.init()
-      initializeCoreBTypesCompat()
+      genBCode.bTypes.initializeCoreBTypes()
       jsPrimitives.init()
       super.run()
     }

compiler/src/test/scala/org/scalajs/nscplugin/test/util/DirectTest.scala

@@ -95,8 +95,7 @@ abstract class DirectTest {
   def compileString(sourceCode: String): Boolean =
     compileString(defaultGlobal)(sourceCode)
 
-  // Cannot reuse global, otherwise compiler crashes with Scala >= 2.11.5
-  // on following tests:
+  // Cannot reuse global, otherwise the compiler crashes on the following tests:
   // - org.scalajs.nscplugin.test.JSExportTest
   // - org.scalajs.nscplugin.test.JSDynamicLiteralTest
   // Filed as #1443