From c659a017725680850433fa7da3614eeb30948839 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Wed, 10 Oct 2018 08:07:42 -0700 Subject: [PATCH] update Scala.js and sbt versions --- build.sbt | 5 ++++- examples/scalajs/project/build.sbt | 2 +- project/build.properties | 2 +- project/plugin.sbt | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index f91b684a8..7c854b066 100644 --- a/build.sbt +++ b/build.sbt @@ -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) diff --git a/examples/scalajs/project/build.sbt b/examples/scalajs/project/build.sbt index de824ead7..de38c267d 100644 --- a/examples/scalajs/project/build.sbt +++ b/examples/scalajs/project/build.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.22") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.25") diff --git a/project/build.properties b/project/build.properties index 31334bbd3..0cd8b0798 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.1 +sbt.version=1.2.3 diff --git a/project/plugin.sbt b/project/plugin.sbt index 5dea6ce83..32aaea554 100644 --- a/project/plugin.sbt +++ b/project/plugin.sbt @@ -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)