diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2015-04-24 09:55:38 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2015-04-24 09:55:38 -0700 |
commit | 1c871406fdd08157e70fe4dfe2f59c517f7d0357 (patch) | |
tree | 494ce288228c5b3cf82a3a2e27b0cc078e55663e /src/main/scala/workbench/Plugin.scala | |
parent | 0fae432ed016499aa1e290a3518fcd7ca5d91832 (diff) | |
parent | cdef282f9eb5a45d41228e4764a184df98bbb337 (diff) | |
download | workbench-1c871406fdd08157e70fe4dfe2f59c517f7d0357.tar.gz workbench-1c871406fdd08157e70fe4dfe2f59c517f7d0357.tar.bz2 workbench-1c871406fdd08157e70fe4dfe2f59c517f7d0357.zip |
Merge pull request #20 from nightscape/update_scala_js
First shot at updating Scala.js
Diffstat (limited to 'src/main/scala/workbench/Plugin.scala')
-rw-r--r-- | src/main/scala/workbench/Plugin.scala | 25 |
1 files changed, 13 insertions, 12 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") |