First shot at updating Scala.js

2 files changed, 18 insertions, 18 deletions

diff --git a/src/main/scala/workbench/Plugin.scala b/src/main/scala/workbench/Plugin.scala
index dd3cab9..4c6fb9d 100644
--- a/src/main/scala/workbench/Plugin.scala
+++ b/src/main/scala/workbench/Plugin.scala
@@ -3,13 +3,13 @@ import scala.concurrent.ExecutionContext.Implicits.global
 import sbt._
 import sbt.Keys._
 import autowire._
-import scala.scalajs.sbtplugin.ScalaJSPlugin.ScalaJSKeys
-import scala.scalajs.tools.io._
-import scala.scalajs.tools.optimizer.ScalaJSOptimizer
-import scala.scalajs.sbtplugin.ScalaJSPluginInternal._
-import scala.scalajs.sbtplugin.Implicits._
+import org.scalajs.sbtplugin.ScalaJSPlugin.AutoImport
+import org.scalajs.core.tools.io._
+import org.scalajs.core.tools.optimizer.ScalaJSOptimizer
+import org.scalajs.sbtplugin.ScalaJSPluginInternal._
+import org.scalajs.sbtplugin.Implicits._
 
-import ScalaJSKeys._
+import AutoImport._
 object Plugin extends sbt.Plugin {
 
   val refreshBrowsers = taskKey[Unit]("Sends a message to all connected web pages asking them to refresh the page")
@@ -137,15 +137,16 @@ object Plugin extends sbt.Plugin {
         import ScalaJSOptimizer._
 
         (scalaJSOptimizer in fastOptJS).value.optimizeCP(
-          Inputs(input = (preLinkClasspath in fastOptJS).value),
-          OutputConfig(
+          (scalaJSPreLinkClasspath in fastOptJS).value,
+          Config(
             output = WritableFileVirtualJSFile(output),
             cache = None,
             wantSourceMap = (emitSourceMaps in fastOptJS).value,
             relativizeSourceMapBase = relSourceMapBase,
-            checkIR = (checkScalaJSIR in fastOptJS).value,
-            disableInliner = (inliningMode in fastOptJS).value.disabled,
-            batchInline = (inliningMode in fastOptJS).value.batch),
+            checkIR = (scalaJSOptimizerOptions in fastOptJS).value.checkScalaJSIR,
+            disableOptimizer = (scalaJSOptimizerOptions in fastOptJS).value.disableOptimizer,
+            batchMode = (scalaJSOptimizerOptions in fastOptJS).value.batchMode
+            ),
           s.log
         )
         // end of C&P
@@ -165,7 +166,7 @@ object Plugin extends sbt.Plugin {
           ).call()
           ()
         }
-      }.dependsOn(packageJSDependencies, packageLauncher, compile)
+      }.dependsOn(packageJSDependencies, packageScalaJSLauncher, compile)
     },
     sjsReset := {
       println("Clearing sjs REPL History")
diff --git a/src/main/scala/workbench/Server.scala b/src/main/scala/workbench/Server.scala
index 4df8b61..484999e 100644
--- a/src/main/scala/workbench/Server.scala
+++ b/src/main/scala/workbench/Server.scala
@@ -14,18 +14,17 @@ import spray.http.HttpHeaders.`Access-Control-Allow-Origin`
 import concurrent.duration._
 import scala.concurrent.Future
 import scala.io.Source
-import scala.scalajs.tools.optimizer.{ScalaJSClosureOptimizer, ScalaJSOptimizer}
-import scala.scalajs.tools.io._
-import scala.scalajs.tools.logging.Level
+import org.scalajs.core.tools.optimizer.{ScalaJSClosureOptimizer, ScalaJSOptimizer}
+import org.scalajs.core.tools.io._
+import org.scalajs.core.tools.logging.Level
 import scala.tools.nsc
 import scala.tools.nsc.Settings
 
 import scala.tools.nsc.backend.JavaPlatform
-import scala.tools.nsc.plugins.Plugin
 import scala.tools.nsc.util.ClassPath.JavaContext
 import scala.collection.mutable
 import scala.tools.nsc.typechecker.Analyzer
-import scala.scalajs.tools.classpath.{CompleteNCClasspath, CompleteCIClasspath, PartialIRClasspath, PartialClasspath}
+import org.scalajs.core.tools.classpath.{CompleteClasspath, PartialClasspath}
 import scala.tools.nsc.util.{JavaClassPath, DirectoryClassPath}
 
 class Server(url: String, port: Int, bootSnippet: String) extends SimpleRoutingApp{
@@ -107,7 +106,7 @@ class Server(url: String, port: Int, bootSnippet: String) extends SimpleRoutingA
           (function(){
             $body
 
-            WorkbenchClient().main(${upickle.write(bootSnippet)}, ${upickle.write(url)}, ${upickle.write(port)})
+            com.lihaoyi.workbench.WorkbenchClient().main(${upickle.write(bootSnippet)}, ${upickle.write(url)}, ${upickle.write(port)})
           }).call(this)
           """
         }