more fixes for scalajs env

5 files changed, 28 insertions, 7 deletions

diff --git a/build.sc b/build.sc
index 54c916a3..aed391d4 100755
--- a/build.sc
+++ b/build.sc
@@ -224,7 +224,10 @@ object scalajslib extends MillModule {
         Agg(
           ivy"org.scala-js::scalajs-tools:0.6.22",
           ivy"org.scala-js::scalajs-sbt-test-adapter:0.6.22",
-          ivy"org.scala-js::scalajs-js-envs:0.6.22"
+          ivy"org.scala-js::scalajs-js-envs:0.6.22",
+          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"
         )
       case "1.0" =>
         Agg(
@@ -232,7 +235,10 @@ object scalajslib extends MillModule {
           ivy"org.scala-js::scalajs-sbt-test-adapter:1.0.0-M2",
           ivy"org.scala-js::scalajs-env-nodejs:1.0.0-M2",
           ivy"org.scala-js::scalajs-env-jsdom-nodejs:1.0.0-M2",
-          ivy"org.scala-js::scalajs-env-phantomjs:1.0.0-M2"
+          ivy"org.scala-js::scalajs-env-phantomjs:1.0.0-M2",
+          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"
         )
     }
   }
diff --git a/main/src/modules/Jvm.scala b/main/src/modules/Jvm.scala
index c1f07a9b..57606c3f 100644
--- a/main/src/modules/Jvm.scala
+++ b/main/src/modules/Jvm.scala
@@ -445,7 +445,14 @@ object Jvm {
             classifiers = Some(Seq(coursier.Classifier("sources")))
           )
         }
-        else resolution.artifacts()
+        else resolution.artifacts(
+          types = Set(
+            coursier.Type.jar,
+            coursier.Type.testJar,
+            coursier.Type.bundle,
+            coursier.Type("orbit")
+          )
+        )
       val (errors, successes) = load(sourceOrJar)
       if(errors.isEmpty){
         mill.Agg.from(
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],
diff --git a/scratch/build.sc b/scratch/build.sc
index d9271f2d..d2b4ec54 100644
--- a/scratch/build.sc
+++ b/scratch/build.sc
@@ -2,6 +2,10 @@ import mill.Agg
 import mill.scalalib._
 
 object core extends ScalaModule{
-  def scalaVersion = "2.13.0-RC2"
+  def scalaVersion = "2.12.8"
+  def ivyDeps = Agg(
+    ivy"org.eclipse.jetty:jetty-websocket:8.1.16.v20140903",
+    ivy"org.eclipse.jetty:jetty-server:8.1.16.v20140903"
+  )
 }