Skip to content

Upgrade to Scala.js 1.0.0-M3. #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2018
Merged

Upgrade to Scala.js 1.0.0-M3. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions jsdom-nodejs-env/src/main/scala/org/scalajs/jsenv/jsdomnodejs/JSDOMNodeJSEnv.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"