Skip to content

Commit 98ab589

Browse files
authored
Merge pull request #435 from SethTisue/m5-followup
update Scala.js and sbt versions (on 2.13 release branch)
2 parents d5653ce + c659a01 commit 98ab589

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

build.sbt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,10 @@ lazy val js = project.in(file("js"))
131131
.settings(sharedSettings: _*)
132132
.settings(
133133
scalaJSStage in Global := FastOptStage,
134-
libraryDependencies += "org.scala-js" %% "scalajs-test-interface" % scalaJSVersion
134+
libraryDependencies += "org.scala-js" %% "scalajs-test-interface" % scalaJSVersion,
135+
// because Scala.js deprecated TestUtils but we haven't worked around that yet,
136+
// see https://github.com/rickynils/scalacheck/pull/435#issuecomment-430405390
137+
scalacOptions ~= (_ filterNot (_ == "-Xfatal-warnings"))
135138
)
136139
.enablePlugins(ScalaJSPlugin)
137140

examples/scalajs/project/build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22")
1+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25")

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.1.1
1+
sbt.version=1.2.3

project/plugin.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.2.0")
33
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.1")
44

55
val scalaJSVersion =
6-
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.23")
6+
Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.25")
77

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

0 commit comments

Comments
 (0)