Skip to content

Commit 5df662c

Browse files
committed
bump sbt, scala & dependency versions to latest
1 parent 151ef0d commit 5df662c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

build.sbt

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ crossScalaVersions in ThisBuild := {
55
val isJDK6Or7 =
66
javaVersion.startsWith("1.6.") || javaVersion.startsWith("1.7.")
77
if (isJDK6Or7)
8-
Seq("2.11.7")
8+
Seq("2.11.8")
99
else
10-
Seq("2.11.7", "2.12.0-M3")
10+
Seq("2.11.8", "2.12.0-RC1")
1111
}
1212

1313
lazy val `scala-parser-combinators` = crossProject.in(file(".")).
@@ -43,8 +43,8 @@ lazy val `scala-parser-combinators` = crossProject.in(file(".")).
4343
).
4444
jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin)).
4545
jvmSettings(
46-
libraryDependencies += "junit" % "junit" % "4.11" % "test",
47-
libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test"
46+
libraryDependencies += "junit" % "junit" % "4.12" % "test",
47+
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test"
4848
).
4949
jvmSettings(
5050
mimaPreviousVersion := Some("1.0.4")

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.9
1+
sbt.version=0.13.12

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.4")
22

3-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.6")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")

0 commit comments

Comments
 (0)