Skip to content

Commit 971e511

Browse files
committed
Upgrade to Scala.js 0.6.18, sbt 0.13.15 and Scala {2.11.11,2.12.2,2.13.0-M1}.
1 parent 6c2b2a5 commit 971e511

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ script:
88
- sbt ++$TRAVIS_SCALA_VERSION publishLocal
99
scala:
1010
- 2.10.6
11-
- 2.11.8
12-
- 2.12.1
11+
- 2.11.11
12+
- 2.12.2
13+
- 2.13.0-M1
1314
jdk:
1415
- oraclejdk8

build.sbt

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

4-
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1")
4+
crossScalaVersions in ThisBuild := Seq("2.11.11", "2.10.6", "2.12.2", "2.13.0-M1")
5+
scalaVersion in ThisBuild := (crossScalaVersions in ThisBuild).value.head
56

67
val commonSettings: Seq[Setting[_]] = Seq(
78
version := "0.1.2-SNAPSHOT",
89
organization := "org.scala-js",
9-
scalaVersion := "2.11.8",
1010
scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
1111

1212
homepage := Some(url("http://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.13
1+
sbt.version=0.13.15

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.15")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.18")
22

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

0 commit comments

Comments
 (0)