Skip to content

bump sbt, scala & dependency versions to latest #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 22, 2016
Merged

bump sbt, scala & dependency versions to latest #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(".")).
Expand Down Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.9
sbt.version=0.13.12
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")