wip

Author: sjrd

project/Build.scala

@@ -19,6 +19,9 @@ import dotty.tools.sbtplugin.DottyPlugin.autoImport._
 import dotty.tools.sbtplugin.DottyIDEPlugin.{ installCodeExtension, prepareCommand, runProcess }
 import dotty.tools.sbtplugin.DottyIDEPlugin.autoImport._
 
+import org.scalajs.sbtplugin.ScalaJSPlugin
+import org.scalajs.sbtplugin.ScalaJSPlugin.autoImport._
+
 import sbtbuildinfo.BuildInfoPlugin
 import sbtbuildinfo.BuildInfoPlugin.autoImport._
 
@@ -633,14 +636,14 @@ object Build {
 
       run := dotc.evaluated,
       dotc := runCompilerMain().evaluated,
-      repl := runCompilerMain(repl = true).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(),
+      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
@@ -650,7 +653,7 @@ object Build {
       ivyConfigurations += config("sourcedeps").hide,
       transitiveClassifiers := Seq("sources"),
       libraryDependencies +=
-        ("org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps").withDottyCompat(),
+        ("org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps").withDottyCompat(scalaVersion.value),
       sourceGenerators in Compile += Def.task {
         val s = streams.value
         val cacheDir = s.cacheDirectory
@@ -925,30 +928,25 @@ object Build {
       /* Remove the Scala.js compiler plugin for scalac, and enable the
        * Scala.js back-end of dotty instead.
        */
-      libraryDependencies ~= { deps =>
-        deps.filterNot(_.name.startsWith("scalajs-compiler")).map(_.withDottyCompat())
+      libraryDependencies := {
+        val deps = libraryDependencies.value
+        deps.filterNot(_.name.startsWith("scalajs-compiler")).map(_.withDottyCompat(scalaVersion.value))
       },
       scalacOptions += "-scalajs",
 
       // The main class cannot be found automatically due to the empty inc.Analysis
-      mainClass in Compile := Some("hello.world"),
+      mainClass in Compile := Some("hello.HelloWorld"),
 
       scalaJSUseMainModuleInitializer := true,
 
       /* Debug-friendly Scala.js optimizer options.
        * In particular, typecheck the Scala.js IR found on the classpath.
        */
-      scalaJSOptimizerOptions ~= {
-        _.withCheckScalaJSIR(true).withParallel(false)
+      scalaJSLinkerConfig ~= {
+        _.withCheckIR(true).withParallel(false)
       }
     ).
-    settings(compileWithDottySettings).
-    settings(inConfig(Compile)(Seq(
-      /* Make sure jsDependencyManifest runs after compile, otherwise compile
-       * might remove the entire directory afterwards.
-       */
-      jsDependencyManifest := jsDependencyManifest.dependsOn(compile).value
-    )))
+    settings(compileWithDottySettings)
 
   lazy val `dotty-bench` = project.in(file("bench")).asDottyBench(NonBootstrapped)
   lazy val `dotty-bench-bootstrapped` = project.in(file("bench")).asDottyBench(Bootstrapped)

sandbox/scalajs/src/hello.scala

@@ -7,7 +7,7 @@ trait MyTrait {
   def foo(y: Int) = x
 }
 
-object world extends MyTrait {
+object HelloWorld extends MyTrait {
   def main(): Unit = {
     println("hello dotty.js!")
     println(foo(4))