Skip to content

Commit

Permalink
Merge pull request #435 from SethTisue/m5-followup
Browse files Browse the repository at this point in the history
update Scala.js and sbt versions (on 2.13 release branch)
  • Loading branch information
rickynils authored Oct 17, 2018
2 parents d5653ce + c659a01 commit 98ab589
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
5 changes: 4 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,10 @@ lazy val js = project.in(file("js"))
.settings(sharedSettings: _*)
.settings(
scalaJSStage in Global := FastOptStage,
libraryDependencies += "org.scala-js" %% "scalajs-test-interface" % scalaJSVersion
libraryDependencies += "org.scala-js" %% "scalajs-test-interface" % scalaJSVersion,
// because Scala.js deprecated TestUtils but we haven't worked around that yet,
// see https://github.com/rickynils/scalacheck/pull/435#issuecomment-430405390
scalacOptions ~= (_ filterNot (_ == "-Xfatal-warnings"))
)
.enablePlugins(ScalaJSPlugin)

Expand Down
2 changes: 1 addition & 1 deletion examples/scalajs/project/build.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.1.1
sbt.version=1.2.3
2 changes: 1 addition & 1 deletion project/plugin.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.2.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")

val scalaJSVersion =
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.23")
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.25")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion)

Expand Down

0 comments on commit 98ab589

Please sign in to comment.