Drop sbt 0.13.x support

Author: gzm0

Diff for: DEVELOPING.md

@@ -184,5 +184,5 @@ following incantations.
 
     > ++SCALA_VERSION
     > ;compiler/publishLocal;library/publishLocal;testInterface/publishLocal;testBridge/publishLocal;jUnitRuntime/publishLocal;jUnitPlugin/publishLocal
-    > ++2.10.7
+    > ++2.12.8
     > ;ir/publishLocal;io/publishLocal;logging/publishLocal;linker/publishLocal;jsEnvs/publishLocal;jsEnvsTestKit/publishLocal;nodeJSEnv/publishLocal;testAdapter/publishLocal;sbtPlugin/publishLocal

Diff for: Jenkinsfile

@@ -370,21 +370,19 @@ def Tasks = [
 
   "sbtplugin-test": '''
     setJavaVersion 1.8
-    SBT_VER_OVERRIDE=$sbt_version_override
     # Publish Scala.js artifacts locally
     # Then go into standalone project and test
     npm install &&
     sbt ++2.11.12 compiler/publishLocal library/publishLocal \
                   testInterface/publishLocal testBridge/publishLocal \
                   jUnitPlugin/publishLocal jUnitRuntime/publishLocal &&
-    sbt ++$toolsscala ${SBT_VER_OVERRIDE:+^^$SBT_VER_OVERRIDE} \
+    sbt ++$toolsscala \
         ir/publishLocal logging/publishLocal \
         linker/publishLocal jsEnvs/publishLocal \
         nodeJSEnv/publishLocal testAdapter/publishLocal \
         sbtPlugin/publishLocal &&
     cd sbt-plugin-test &&
     setJavaVersion $java &&
-    if [ -n "$SBT_VER_OVERRIDE" ]; then echo "sbt.version=$SBT_VER_OVERRIDE" > ./project/build.properties; fi &&
     sbt noDOM/run \
         noDOM/testHtml multiTestJS/testHtml \
         test \
@@ -456,13 +454,12 @@ mainScalaVersions.each { scalaVersion ->
 }
 quickMatrix.add([task: "test-suite-ecma-script5-force-polyfills", scala: mainScalaVersion, java: mainJavaVersion, testSuite: "testSuite"])
 allJavaVersions.each { javaVersion ->
-  quickMatrix.add([task: "tools-sbtplugin", scala: "2.12.8", sbt_version_override: "", java: javaVersion])
+  quickMatrix.add([task: "tools-sbtplugin", scala: "2.12.8", java: javaVersion])
   quickMatrix.add([task: "tools", scala: "2.10.7", 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: "sbtplugin-test", toolsscala: "2.10.7", sbt_version_override: "0.13.17", java: mainJavaVersion])
-quickMatrix.add([task: "sbtplugin-test", toolsscala: "2.12.8", sbt_version_override: "", java: mainJavaVersion])
+quickMatrix.add([task: "sbtplugin-test", toolsscala: "2.12.8", java: mainJavaVersion])
 
 // The 'full' matrix
 def fullMatrix = quickMatrix.clone()

Diff for: project/Build.scala

@@ -785,13 +785,8 @@ object Build {
       normalizedName := "sbt-scalajs",
       bintrayProjectName := "sbt-scalajs-plugin", // "sbt-scalajs" was taken
       sbtPlugin := true,
-      sbtVersion in pluginCrossBuild := {
-        scalaVersion.value match {
-          case v if v.startsWith("2.10.") => "0.13.17"
-          case _ => "1.0.0"
-        }
-      },
-      crossScalaVersions := Seq("2.10.7", "2.12.8"),
+      crossScalaVersions := Seq("2.12.8"),
+      sbtVersion := "1.0.0",
       scalaBinaryVersion :=
         CrossVersion.binaryScalaVersion(scalaVersion.value),
       previousArtifactSetting,

Diff for: project/build.sbt

@@ -25,7 +25,6 @@ unmanagedSourceDirectories in Compile ++= {
     root / "test-adapter/src/main/scala",
     root / "test-common/src/main/scala",
     root / "sbt-plugin/src/main/scala",
-    root / "sbt-plugin/src/main/scala-sbt-1.0"
   )
 }
 

Diff for: sbt-plugin-test/build.sbt

@@ -164,11 +164,8 @@ lazy val multiTestJVM = project.in(file("multiTest/jvm")).
     // Test platformDepsCrossVersion (as a setting, it's evaluated when loading the build)
     platformDepsCrossVersion := {
       val value = platformDepsCrossVersion.value
-      if (!sbtVersion.value.startsWith("0.")) {
-        // In 0.13, CrossVersions do not have a meaningful ==, but they do in 1.0
-        assert(value == CrossVersion.binary,
-            "platformDepsCrossVersion should be CrossVersion.binary in multiTestJVM")
-      }
+      assert(value == CrossVersion.binary,
+          "platformDepsCrossVersion should be CrossVersion.binary in multiTestJVM")
       value
     }
   ).

Diff for: sbt-plugin/src/main/scala-sbt-0.13/org/scalajs/sbtplugin/SBTCompat.scala

@@ -16,8 +16,6 @@ import sbt._
 
 import org.scalajs.ir.ScalaJSVersions
 
-import SBTCompat._
-
 object ScalaJSCrossVersion {
   private final val ReleaseVersion =
     raw"""(\d+)\.(\d+)\.(\d+)""".r
@@ -32,8 +30,16 @@ object ScalaJSCrossVersion {
     case _                                 => full
   }
 
-  def scalaJSMapped(cross: CrossVersion): CrossVersion =
-    crossVersionAddScalaJSPart(cross, "sjs" + currentBinaryVersion)
+  def scalaJSMapped(cross: CrossVersion): CrossVersion = cross match {
+    case CrossVersion.Disabled =>
+      CrossVersion.constant("sjs" + currentBinaryVersion)
+    case cross: sbt.librarymanagement.Constant =>
+      cross.withValue("sjs" + currentBinaryVersion + "_" + cross.value)
+    case cross: CrossVersion.Binary =>
+      cross.withPrefix("sjs" + currentBinaryVersion + "_" + cross.prefix)
+    case cross: CrossVersion.Full =>
+      cross.withPrefix("sjs" + currentBinaryVersion + "_" + cross.prefix)
+  }
 
   val binary: CrossVersion = scalaJSMapped(CrossVersion.binary)
 

Diff for: sbt-plugin/src/main/scala-sbt-1.0/org/scalajs/sbtplugin/SBTCompat.scala

@@ -181,10 +181,7 @@ object ScalaJSPlugin extends AutoPlugin {
     Seq(
         scalaJSStage := Stage.FastOpt,
 
-        scalaJSLinkerConfig := {
-          StandardLinker.Config()
-            .withParallel(ScalaJSPluginInternal.DefaultParallelLinker)
-        },
+        scalaJSLinkerConfig := StandardLinker.Config(),
 
         jsEnv := new NodeJSEnv(),
 

Diff for: sbt-plugin/src/main/scala/org/scalajs/sbtplugin/ScalaJSCrossVersion.scala

@@ -39,9 +39,9 @@ import org.scalajs.ir.Printers.IRTreePrinter
 import org.scalajs.testing.adapter.{TestAdapter, HTMLRunnerBuilder, TestAdapterInitializer}
 
 import Loggers._
-import SBTCompat._
-import SBTCompat.formatImplicits._
-import SBTCompat.formatImplicits.seqFormat
+
+import sjsonnew.BasicJsonProtocol._
+import sjsonnew.BasicJsonProtocol.seqFormat
 
 /** Implementation details of `ScalaJSPlugin`. */
 private[sbtplugin] object ScalaJSPluginInternal {
@@ -85,26 +85,6 @@ private[sbtplugin] object ScalaJSPluginInternal {
   private[sbtplugin] def closeAllTestAdapters(): Unit =
     createdTestAdapters.getAndSet(Nil).foreach(_.close())
 
-  /* #2798 -- On Java 9+, the parallel collections on 2.10 die with a
-   * `NumberFormatException` and prevent the linker from working.
-   *
-   * By default, we therefore pre-emptively disable the parallel optimizer in
-   * case the parallel collections cannot deal with the current version of
-   * Java.
-   *
-   * TODO This will automatically "fix itself" once we upgrade to sbt 1.x,
-   * which uses Scala 2.12. We should get rid of that workaround at that point
-   * for tidiness, though.
-   */
-  val DefaultParallelLinker: Boolean = {
-    try {
-      scala.util.Properties.isJavaAtLeast("1.8")
-      true
-    } catch {
-      case _: NumberFormatException => false
-    }
-  }
-
   private def enhanceIRVersionNotSupportedException[A](body: => A): A = {
     try {
       body
@@ -131,9 +111,40 @@ private[sbtplugin] object ScalaJSPluginInternal {
     }
   }
 
-  /** Patches the IncOptions so that .sjsir files are pruned as needed. */
-  def scalaJSPatchIncOptions(incOptions: IncOptions): IncOptions =
-    SBTCompat.scalaJSPatchIncOptions(incOptions)
+  /** Patches the IncOptions so that .sjsir files are pruned as needed.
+   *
+   *  This complicated logic patches the ClassfileManager factory of the given
+   *  IncOptions with one that is aware of .sjsir files emitted by the Scala.js
+   *  compiler. This makes sure that, when a .class file must be deleted, the
+   *  corresponding .sjsir file are also deleted.
+   */
+  def scalaJSPatchIncOptions(incOptions: IncOptions): IncOptions = {
+    import xsbti.compile.{ClassFileManager, ClassFileManagerUtil}
+
+    val sjsirFileManager = new ClassFileManager {
+      private[this] val inherited =
+        ClassFileManagerUtil.getDefaultClassFileManager(incOptions)
+
+      def delete(classes: Array[File]): Unit = {
+        inherited.delete(classes.flatMap { classFile =>
+          if (classFile.getPath.endsWith(".class")) {
+            val f = new File(classFile.getPath.stripSuffix(".class") + ".sjsir")
+            if (f.exists) List(f)
+            else Nil
+          } else {
+            Nil
+          }
+        })
+      }
+
+      def generated(classes: Array[File]): Unit = {}
+      def complete(success: Boolean): Unit = {}
+    }
+
+    val newExternalHooks =
+      incOptions.externalHooks.withExternalClassFileManager(sjsirFileManager)
+    incOptions.withExternalHooks(newExternalHooks)
+  }
 
   /** Settings for the production key (e.g. fastOptJS) of a given stage */
   private def scalaJSStageSettings(stage: Stage,

Diff for: sbt-plugin/src/main/scala/org/scalajs/sbtplugin/ScalaJSPlugin.scala

@@ -10,9 +10,7 @@ fi
 COMPILER_VERSIONS="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 2.12.3 2.12.4 2.12.5 2.12.6 2.12.7 2.12.8 2.13.0"
 BIN_VERSIONS="2.11.12 2.12.8 2.13.0"
 JVM_BIN_VERSIONS="2.10.7 2.11.12 2.12.8"
-SBT_VERSION="2.10.7"
-SBT1_VERSION="2.12.8"
-SBT1_SBTVERSION="1.0.0"
+SBT_VERSION="2.12.8"
 
 COMPILER="compiler jUnitPlugin"
 LIBS="library irJS loggingJS linkerJS testInterface testBridge jUnitRuntime"
@@ -46,5 +44,4 @@ for v in $JVM_BIN_VERSIONS; do
 done
 
 # Publish sbt-plugin
-$CMD "++$SBT_VERSION" "sbtPlugin/publishSigned"
-$CMD "++$SBT1_VERSION" "^^$SBT1_SBTVERSION" "sbtPlugin/publishSigned"
+$CMD "++$SBT_VERSION" sbtPlugin/publishSigned"