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

Author: sjrd

compiler/test/dotty/Properties.scala

@@ -58,7 +58,4 @@ object Properties {
 
   /** jline-reader jar */
   def jlineReader: String = sys.props("dotty.tests.classes.jlineReader")
-
-  /** scalajs-ir jar */
-  def scalaJSIR: String = sys.props("dotty.tests.classes.scalaJSIR")
 }

compiler/test/dotty/tools/dotc/CompilationTests.scala

@@ -216,8 +216,7 @@ class CompilationTests extends ParallelTesting {
       defaultOutputDir + dotty1Group + "/dotty/" + sep +
       // and the other compiler dependenies:
       Properties.compilerInterface + sep + Properties.scalaLibrary + sep + Properties.scalaAsm + sep +
-      Properties.dottyInterfaces + sep + Properties.jlineTerminal + sep + Properties.jlineReader + sep +
-      Properties.scalaJSIR,
+      Properties.dottyInterfaces + sep + Properties.jlineTerminal + sep + Properties.jlineReader,
       Array("-Ycheck-reentrant", "-Yemit-tasty-in-class")
     )
 
@@ -233,6 +232,7 @@ class CompilationTests extends ParallelTesting {
 
     val backendDir = Paths.get("scala-backend/src/compiler/scala/tools/nsc/backend")
     val backendJvmDir = Paths.get("scala-backend/src/compiler/scala/tools/nsc/backend/jvm")
+    val scalaJSIRDir = Paths.get("compiler/target/scala-2.12/src_managed/main/scalajs-ir-src/org/scalajs/ir")
 
     // NOTE: Keep these exclusions synchronized with the ones in the sbt build (Build.scala)
     val backendExcluded =
@@ -244,9 +244,11 @@ class CompilationTests extends ParallelTesting {
       sources(Files.list(backendDir), excludedFiles = backendExcluded)
     val backendJvmSources =
       sources(Files.list(backendJvmDir), excludedFiles = backendJvmExcluded)
+    val scalaJSIRSources =
+      sources(Files.list(scalaJSIRDir))
 
-    val dotty1 = compileList("dotty", compilerSources ++ backendSources ++ backendJvmSources, opt)(dotty1Group)
-    val dotty2 = compileList("dotty", compilerSources ++ backendSources ++ backendJvmSources, opt)(dotty2Group)
+    val dotty1 = compileList("dotty", compilerSources ++ backendSources ++ backendJvmSources ++ scalaJSIRSources, opt)(dotty1Group)
+    val dotty2 = compileList("dotty", compilerSources ++ backendSources ++ backendJvmSources ++ scalaJSIRSources, opt)(dotty2Group)
 
     val tests = {
       lib.keepOutput :: dotty1.keepOutput :: {
@@ -263,7 +265,8 @@ class CompilationTests extends ParallelTesting {
         compileShallowFilesInDir("compiler/src/dotty/tools/dotc/typer", opt) +
         compileShallowFilesInDir("compiler/src/dotty/tools/dotc/util", opt) +
         compileList("shallow-backend", backendSources, opt) +
-        compileList("shallow-backend-jvm", backendJvmSources, opt)
+        compileList("shallow-backend-jvm", backendJvmSources, opt) +
+        compileList("shallow-scalajs-ir", scalaJSIRSources, opt)
       }.keepOutput :: Nil
     }.map(_.checkCompile())
 
@@ -301,27 +304,6 @@ class CompilationTests extends ParallelTesting {
 
     compileFilesInDir("tests/plugins/neg").checkExpectedErrors()
   }
-
-  private val (compilerSources, backendSources, backendJvmSources) = {
-    val compilerDir = Paths.get("compiler/src")
-    val compilerSources0 = sources(Files.walk(compilerDir))
-
-    val backendDir = Paths.get("scala-backend/src/compiler/scala/tools/nsc/backend")
-    val backendJvmDir = Paths.get("scala-backend/src/compiler/scala/tools/nsc/backend/jvm")
-
-    // NOTE: Keep these exclusions synchronized with the ones in the sbt build (Build.scala)
-    val backendExcluded =
-      List("JavaPlatform.scala", "Platform.scala", "ScalaPrimitives.scala")
-    val backendJvmExcluded =
-      List("BCodeICodeCommon.scala", "GenASM.scala", "GenBCode.scala", "ScalacBackendInterface.scala", "BackendStats.scala")
-
-    val backendSources0 =
-      sources(Files.list(backendDir), excludedFiles = backendExcluded)
-    val backendJvmSources0 =
-      sources(Files.list(backendJvmDir), excludedFiles = backendJvmExcluded)
-
-    (compilerSources0, backendSources0, backendJvmSources0)
-  }
 }
 
 object CompilationTests {

compiler/test/dotty/tools/vulpix/TestConfiguration.scala

@@ -31,7 +31,6 @@ object TestConfiguration {
     Properties.scalaAsm,
     Properties.jlineTerminal,
     Properties.jlineReader,
-    Properties.scalaJSIR,
     Properties.compilerInterface,
     Properties.dottyInterfaces,
     Properties.dottyLibrary,

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,
@@ -613,8 +615,7 @@ object Build {
           "-Ddotty.tests.classes.scalaAsm=" + findLib(attList, "scala-asm"),
           "-Ddotty.tests.classes.scalaXml=" + findLib(attList, "scala-xml"),
           "-Ddotty.tests.classes.jlineTerminal=" + findLib(attList, "jline-terminal"),
-          "-Ddotty.tests.classes.jlineReader=" + findLib(attList, "jline-reader"),
-          "-Ddotty.tests.classes.scalaJSIR=" + findLib(attList, "scalajs-ir")
+          "-Ddotty.tests.classes.jlineReader=" + findLib(attList, "jline-reader")
         )
 
         jarOpts ::: tuning ::: agentOptions ::: ci_build
@@ -657,19 +658,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 +674,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 +690,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")