Skip to content

Commit b54df5a

Browse files
committed
Upgrades.
* sbt 0.13.16 * Scala 2.10.7, 2.11.12 and 2.12.4 * Scala.js 1.0.0-M2
1 parent 8475c38 commit b54df5a

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
sudo: false
22
language: scala
33
scala:
4-
- 2.10.6
5-
- 2.11.11
6-
- 2.12.2
4+
- 2.10.7
5+
- 2.11.12
6+
- 2.12.4
77
jdk:
88
- oraclejdk8
99
env:

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ inThisBuild(Seq(
22
version := "1.0.0-SNAPSHOT",
33
organization := "org.scala-js",
44

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

99
homepage := Some(url("https://www.scala-js.org/")),

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.15
1+
sbt.version=0.13.16

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M1")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.0-M2")
22

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

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

0 commit comments

Comments
 (0)