diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2019-06-13 23:02:44 +0200 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2019-06-13 23:03:03 +0200 |
| commit | 158d117d7e92a4705fdd783952032bdc14bf92e8 (patch) | |
| tree | 5c0446cc8959d60120c9041be4439dd3e26ae07d /scalajslib | |
| parent | 4bbfbf95dbfc0a051837287abc0ee43bf18de4b9 (diff) | |
| download | mill-158d117d7e92a4705fdd783952032bdc14bf92e8.tar.gz mill-158d117d7e92a4705fdd783952032bdc14bf92e8.tar.bz2 mill-158d117d7e92a4705fdd783952032bdc14bf92e8.zip | |
more fixes for scalajs env
Diffstat (limited to 'scalajslib')
| -rw-r--r-- | scalajslib/src/ScalaJSModule.scala | 5 | ||||
| -rw-r--r-- | scalajslib/worker/0.6/src/ScalaJSWorkerImpl.scala | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/scalajslib/src/ScalaJSModule.scala b/scalajslib/src/ScalaJSModule.scala index 75eb8af2..7dba4e72 100644 --- a/scalajslib/src/ScalaJSModule.scala +++ b/scalajslib/src/ScalaJSModule.scala @@ -38,7 +38,10 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => def scalaJSLinkerClasspath: T[Loose.Agg[PathRef]] = T{ val commonDeps = Seq( ivy"org.scala-js::scalajs-tools:${scalaJSVersion()}", - ivy"org.scala-js::scalajs-sbt-test-adapter:${scalaJSVersion()}" + ivy"org.scala-js::scalajs-sbt-test-adapter:${scalaJSVersion()}", + ivy"org.eclipse.jetty:jetty-websocket:8.1.16.v20140903", + ivy"org.eclipse.jetty:jetty-server:8.1.16.v20140903", + ivy"org.eclipse.jetty.orbit:javax.servlet:3.0.0.v201112011016" ) val envDep = scalaJSBinaryVersion() match { case v if v.startsWith("0.6") => Seq(ivy"org.scala-js::scalajs-js-envs:${scalaJSVersion()}") diff --git a/scalajslib/worker/0.6/src/ScalaJSWorkerImpl.scala b/scalajslib/worker/0.6/src/ScalaJSWorkerImpl.scala index 9e49ef15..cbd8d324 100644 --- a/scalajslib/worker/0.6/src/ScalaJSWorkerImpl.scala +++ b/scalajslib/worker/0.6/src/ScalaJSWorkerImpl.scala @@ -3,16 +3,17 @@ package scalajslib package worker import java.io.File +import java.net.URLClassLoader import mill.api.Result import org.scalajs.core.tools.io.IRFileCache.IRContainer import org.scalajs.core.tools.io._ import org.scalajs.core.tools.jsdep.ResolvedJSDependency -import org.scalajs.core.tools.linker.{ModuleInitializer, StandardLinker, Semantics, ModuleKind => ScalaJSModuleKind} +import org.scalajs.core.tools.linker.{ModuleInitializer, Semantics, StandardLinker, ModuleKind => ScalaJSModuleKind} import org.scalajs.core.tools.logging.ScalaConsoleLogger import org.scalajs.jsenv._ import org.scalajs.testadapter.TestAdapter -import mill.scalajslib.api.{ModuleKind, JsEnvConfig} +import mill.scalajslib.api.{JsEnvConfig, ModuleKind} class ScalaJSWorkerImpl extends mill.scalajslib.api.ScalaJSWorkerApi { def link(sources: Array[File], libraries: Array[File], |