Skip to content

Upgrade to Scala.js 1.0.0-M1. #2

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
Jun 29, 2017
Merged

Upgrade to Scala.js 1.0.0-M1. #2

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
7 changes: 0 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,6 @@ install:
- node --version
# Of course we need jsdom
- npm install jsdom@$JSDOM_VERSION
# While there is no published version of Scala.js 1.x, we have to locally build a snapshot.
- git clone https://github.com/scala-js/scala-js.git
- cd scala-js
- git checkout d25fa8bba708977c68c093fdbc50958368f9602f
- sbt ++$TRAVIS_SCALA_VERSION compiler/publishLocal jUnitPlugin/publishLocal library/publishLocal testInterface/publishLocal jUnitRuntime/publishLocal ir/publishLocal tools/publishLocal jsEnvs/publishLocal jsEnvsTestKit/publishLocal nodeJSEnv/publishLocal
- sbt ++2.10.6 ir/publishLocal tools/publishLocal jsEnvs/publishLocal nodeJSEnv/publishLocal testAdapter/publishLocal sbtPlugin/publishLocal
- cd ..
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
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ lazy val `scalajs-env-jsdom-nodejs`: Project = project.in(file("jsdom-nodejs-env

libraryDependencies ++= Seq(
"org.scala-js" %% "scalajs-js-envs" % scalaJSVersion,
"org.scala-js" %% "scalajs-nodejs-env" % scalaJSVersion,
"org.scala-js" %% "scalajs-env-nodejs" % scalaJSVersion,

"com.novocode" % "junit-interface" % "0.11" % "test",
"org.scala-js" %% "scalajs-js-envs-test-kit" % scalaJSVersion % "test"
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-SNAPSHOT")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M1")

libraryDependencies += "org.scala-js" %% "scalajs-nodejs-env" % "1.0.0-SNAPSHOT"
libraryDependencies += "org.scala-js" %% "scalajs-env-nodejs" % "1.0.0-M1"

unmanagedSourceDirectories in Compile +=
baseDirectory.value.getParentFile / "jsdom-nodejs-env/src/main/scala"