From 54038e54ecf80d3719e522142f0943e2b1e523b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Thu, 29 Jun 2017 19:29:54 +0200 Subject: [PATCH] Upgrade to Scala.js 1.0.0-M1. --- .travis.yml | 7 ------- build.sbt | 2 +- project/plugins.sbt | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index dbece55..660f70b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/build.sbt b/build.sbt index 511eb75..6c0e60d 100644 --- a/build.sbt +++ b/build.sbt @@ -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" diff --git a/project/plugins.sbt b/project/plugins.sbt index ab8517d..422fd41 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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"