diff --git a/build.sbt b/build.sbt index 0e3d33f7..a8d6ccef 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ scalaVersion in ThisBuild := crossScalaVersions.value.head crossScalaVersions in ThisBuild := { val v211 = List("2.11.8") - val v212 = List("2.12.0-RC1") + val v212 = List("2.12.1") val javaVersion = System.getProperty("java.version") val isTravisPublishing = !util.Properties.envOrElse("TRAVIS_TAG", "").trim.isEmpty @@ -31,7 +31,8 @@ lazy val `scala-parser-combinators` = crossProject.in(file(".")). name := "scala-parser-combinators" ). jsSettings( - name := "scala-parser-combinators-js" + name := "scala-parser-combinators-js", + scalaJSUseRhino := true ). settings( moduleName := "scala-parser-combinators", diff --git a/project/build.properties b/project/build.properties index 35c88bab..27e88aa1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.12 +sbt.version=0.13.13 diff --git a/project/plugins.sbt b/project/plugins.sbt index 983683a9..84624327 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.12") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")