From 286896c44c9e41841f963feac9af87522b651f97 Mon Sep 17 00:00:00 2001 From: Scala steward Date: Mon, 28 Jan 2019 03:44:55 +0100 Subject: [PATCH 1/2] Update sbt-scalajs, scalajs-compiler, ... to 0.6.26 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f166d63cc..4a28009d2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,7 +6,7 @@ else Seq(addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3")) val scalaJSVersion = - Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.25") + Option(System.getenv("SCALAJS_VERSION")).filter(_.nonEmpty).getOrElse("0.6.26") addSbtPlugin("org.scala-js" % "sbt-scalajs" % scalaJSVersion) addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "0.6.0") From f917ecec6f931c6334dc5d35ea57ecd4561efc3a Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 29 Jan 2019 13:02:35 -0800 Subject: [PATCH 2/2] bump Scala.js version in Travis-CI config, too --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index db12e9710..b279ac34f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,13 +29,13 @@ env: matrix: # The empty SCALAJS_VERSION will only compile for the JVM - SCALAJS_VERSION= - - SCALAJS_VERSION=0.6.25 + - SCALAJS_VERSION=0.6.26 - SCALAJS_VERSION=1.0.0-M6 matrix: exclude: - jdk: openjdk11 - env: SCALAJS_VERSION=0.6.25 + env: SCALAJS_VERSION=0.6.26 - jdk: openjdk11 env: SCALAJS_VERSION=1.0.0-M6 - scala: 2.11.12