diff --git a/build.sbt b/build.sbt index 61cdd133..a4f93bcf 100644 --- a/build.sbt +++ b/build.sbt @@ -5,9 +5,9 @@ crossScalaVersions in ThisBuild := { val isJDK6Or7 = javaVersion.startsWith("1.6.") || javaVersion.startsWith("1.7.") if (isJDK6Or7) - Seq("2.11.7") + Seq("2.11.8") else - Seq("2.11.7", "2.12.0-M3") + Seq("2.11.8", "2.12.0-RC1") } lazy val `scala-parser-combinators` = crossProject.in(file(".")). @@ -43,8 +43,8 @@ lazy val `scala-parser-combinators` = crossProject.in(file(".")). ). jsConfigure(_.enablePlugins(ScalaJSJUnitPlugin)). jvmSettings( - libraryDependencies += "junit" % "junit" % "4.11" % "test", - libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test" + libraryDependencies += "junit" % "junit" % "4.12" % "test", + libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % "test" ). jvmSettings( mimaPreviousVersion := Some("1.0.4") diff --git a/project/build.properties b/project/build.properties index 817bc38d..35c88bab 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.9 +sbt.version=0.13.12 diff --git a/project/plugins.sbt b/project/plugins.sbt index 8fef081e..983683a9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.4") -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.6") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")