Merge pull request #9 from sjrd/scalajs-1.0.0-M3

Upgrade to Scala.js 1.0.0-M3.

Author: sjrd

.travis.yml

@@ -18,7 +18,10 @@ install:
   - npm install jsdom@$JSDOM_VERSION
 script:
   - sbt ++$TRAVIS_SCALA_VERSION scalajs-env-jsdom-nodejs/test scalajs-env-jsdom-nodejs/doc
-  - sbt ++$TRAVIS_SCALA_VERSION test-project/run test-project/test
+  - |
+      if [[ "${TRAVIS_SCALA_VERSION}" != "2.10.7" ]]; then
+        sbt ++$TRAVIS_SCALA_VERSION test-project/run test-project/test
+      fi
 cache:
   directories:
     - $HOME/.ivy2/cache

jsdom-nodejs-env/src/main/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnv.scala

@@ -12,12 +12,12 @@ import scala.collection.immutable
 
 import java.io.OutputStream
 
-import org.scalajs.core.tools.io._
+import org.scalajs.io._
+import org.scalajs.io.JSUtils.escapeJS
+
 import org.scalajs.jsenv._
 import org.scalajs.jsenv.nodejs.AbstractNodeJSEnv
 
-import org.scalajs.core.ir.Utils.escapeJS
-
 class JSDOMNodeJSEnv(config: JSDOMNodeJSEnv.Config) extends AbstractNodeJSEnv {
 
   def this() = this(JSDOMNodeJSEnv.Config())

project/plugins.sbt

@@ -1,6 +1,6 @@
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M2")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M3")
 
-libraryDependencies += "org.scala-js" %% "scalajs-env-nodejs" % "1.0.0-M2"
+libraryDependencies += "org.scala-js" %% "scalajs-env-nodejs" % "1.0.0-M3"
 
 unmanagedSourceDirectories in Compile +=
   baseDirectory.value.getParentFile / "jsdom-nodejs-env/src/main/scala"