Upgrade to Scala.js 1.0.0-M6 and source-depend on scalajs-ir.

Author: sjrd

project/Build.scala

@@ -117,6 +117,8 @@ object Build {
   lazy val ideTestsCompilerArguments = taskKey[Seq[String]]("Compiler arguments to use in IDE tests")
   lazy val ideTestsDependencyClasspath = taskKey[Seq[File]]("Dependency classpath to use in IDE tests")
 
+  lazy val SourceDeps = config("sourcedeps")
+
   // Settings shared by the build (scoped in ThisBuild). Used in build.sbt
   lazy val thisBuildSettings = Def.settings(
     organization := dottyOrganization,
@@ -657,19 +659,12 @@ object Build {
       dotc := runCompilerMain().evaluated,
       repl := runCompilerMain(repl = true).evaluated,
 
-      // FIXME: Adding the sources of scala-js ir doesn't work anymore because scalajs-ir has a few
-      // compilation errors when compiled by Dotty:
-      // - inline is now a keyword
-      // - methods defined with () need to be called with ()
-      // Until they're fixed, we rely on scalajs-ir compiled by Scala 2:
-      libraryDependencies += ("org.scala-js" %% "scalajs-ir" % scalaJSVersion).withDottyCompat(scalaVersion.value),
-      /*
       /* Add the sources of scalajs-ir.
        * To guarantee that dotty can bootstrap without depending on a version
        * of scalajs-ir built with a different Scala compiler, we add its
        * sources instead of depending on the binaries.
        */
-      ivyConfigurations += config("sourcedeps").hide,
+      ivyConfigurations += SourceDeps.hide,
       transitiveClassifiers := Seq("sources"),
       libraryDependencies +=
         ("org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps").withDottyCompat(scalaVersion.value),
@@ -680,7 +675,7 @@ object Build {
 
         val report = updateClassifiers.value
         val scalaJSIRSourcesJar = report.select(
-            configuration = Set("sourcedeps"),
+            configuration = configurationFilter("sourcedeps"),
             module = (_: ModuleID).name.startsWith("scalajs-ir_"),
             artifact = artifactFilter(`type` = "src")).headOption.getOrElse {
           sys.error(s"Could not fetch scalajs-ir sources")
@@ -696,7 +691,6 @@ object Build {
           (trgDir ** "*.scala").get.toSet
         } (Set(scalaJSIRSourcesJar)).toSeq
       }.taskValue,
-      */
   )
 
   def runCompilerMain(repl: Boolean = false) = Def.inputTaskDyn {

project/plugins.sbt

@@ -5,7 +5,7 @@
 // Scala IDE project file generator
 addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M5")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M6")
 
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.1")