Skip to content

Upgrades. #6

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.

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 2 commits into from
Nov 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 3 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
sudo: false
language: scala
scala:
- 2.10.6
- 2.11.11
- 2.12.2
- 2.10.7
- 2.11.12
- 2.12.4
jdk:
- oraclejdk8
env:
- JSDOM_VERSION=9.12.0
- JSDOM_VERSION=10.0.0
install:
# The default ivy resolution takes way too much time, and times out Travis builds.
# We use coursier instead.
- mkdir -p $HOME/.sbt/0.13/plugins/
- echo 'addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-RC3")' > $HOME/.sbt/0.13/plugins/coursier.sbt
# We need a recent version of Node.js for jsdom
- nvm install 6
- nvm use 6
Expand All @@ -31,4 +27,3 @@ cache:
before_cache:
- find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete
- find $HOME/.sbt -name "*.lock" -print -delete
- rm $HOME/.sbt/0.13/plugins/coursier.sbt
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ inThisBuild(Seq(
version := "1.0.0-SNAPSHOT",
organization := "org.scala-js",

crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.2"),
scalaVersion := "2.11.11",
crossScalaVersions := Seq("2.12.4", "2.10.7", "2.11.12"),
scalaVersion := crossScalaVersions.value.head,
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),

homepage := Some(url("https://www.scala-js.org/")),
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.15
sbt.version=0.13.16
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M1")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M2")

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

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