Skip to content

Commit e201a78

Browse files
committed
Upgrade to sbt 0.13.13, Scala 2.12.0 and Scala.js 0.6.13.
1 parent fe7a3fe commit e201a78

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ script:
44
- sbt ++$TRAVIS_SCALA_VERSION root/scalastyle testSuiteJVM/scalastyle testSuiteJVM/test:scalastyle testSuite/scalastyle testSuite/test:scalastyle
55
- sbt ++$TRAVIS_SCALA_VERSION testSuiteJVM/test
66
- sbt ++$TRAVIS_SCALA_VERSION testSuite/test
7-
- sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSUseRhino in Global := false' testSuite/test
8-
- sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSUseRhino in Global := false' 'set scalaJSStage in Global := FullOptStage' testSuite/test
7+
- sbt ++$TRAVIS_SCALA_VERSION 'set scalaJSStage in Global := FullOptStage' testSuite/test
98
- sbt ++$TRAVIS_SCALA_VERSION publishLocal
109
scala:
1110
- 2.10.6
1211
- 2.11.8
13-
- 2.12.0-M4
12+
- 2.12.0
1413
jdk:
1514
- oraclejdk8

build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import sbt.Keys._
22
import org.scalajs.sbtplugin.cross.CrossProject
33

4+
crossScalaVersions := Seq("2.10.4", "2.11.8", "2.12.0")
5+
46
val commonSettings: Seq[Setting[_]] = Seq(
57
version := "0.1.1-SNAPSHOT",
68
organization := "org.scala-js",

project/build.properties

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

project/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.9")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
22

33
addSbtPlugin("org.scalastyle" % "scalastyle-sbt-plugin" % "0.8.0")

0 commit comments

Comments
 (0)