Skip to content

Commit c1f9de4

Browse files
authored
Merge pull request #199 from gslowikowski/upgrade-scala-versions
Upgrade Scala versions in build and Travis configuration.
2 parents d35434d + 16d11bd commit c1f9de4

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ matrix:
88
- jdk: oraclejdk7
99
scala: 2.10.6
1010
- jdk: oraclejdk7
11-
scala: 2.11.8
11+
scala: 2.11.11
1212
- jdk: oraclejdk8
13-
scala: 2.12.1
13+
scala: 2.12.3
1414

1515
before_cache:
1616
- find "$HOME/.sbt/" -name '*.lock' -print0 | xargs -0 rm

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ val ScalatestVersion = "3.0.0"
1212

1313
val appSettings = Seq(
1414
organization := Org,
15-
scalaVersion := "2.12.1",
16-
crossScalaVersions := Seq("2.10.6", "2.11.8", "2.12.1"),
15+
scalaVersion := "2.12.3",
16+
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.3"),
1717
fork in Test := false,
1818
publishMavenStyle := true,
1919
publishArtifact in Test := false,

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.1")
44

55
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.3")
66

7-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
7+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.19")

0 commit comments

Comments
 (0)