Skip to content

Commit acddd21

Browse files
authored
Merge pull request #92 from gourlaysama/bump4
bump scala, sbt & scala-js dependency versions
2 parents b71f12e + 6c52b6a commit acddd21

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

build.sbt

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ scalaVersion in ThisBuild := crossScalaVersions.value.head
22

33
crossScalaVersions in ThisBuild := {
44
val v211 = List("2.11.8")
5-
val v212 = List("2.12.0-RC1")
5+
val v212 = List("2.12.1")
66

77
val javaVersion = System.getProperty("java.version")
88
val isTravisPublishing = !util.Properties.envOrElse("TRAVIS_TAG", "").trim.isEmpty
@@ -31,7 +31,8 @@ lazy val `scala-parser-combinators` = crossProject.in(file(".")).
3131
name := "scala-parser-combinators"
3232
).
3333
jsSettings(
34-
name := "scala-parser-combinators-js"
34+
name := "scala-parser-combinators-js",
35+
scalaJSUseRhino := true
3536
).
3637
settings(
3738
moduleName := "scala-parser-combinators",

project/build.properties

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

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.12")
3+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")

0 commit comments

Comments
 (0)