From 14aafec52706a57d2f7bba26a4f308a22b1a92c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Sat, 20 Oct 2018 16:58:05 +0200 Subject: [PATCH 1/2] Upgrade to Scala.js 1.0.0-M6. --- .travis.yml | 2 +- appveyor.yml | 2 +- build.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4774fda..117cf59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ scala: jdk: - oraclejdk8 env: - - SCALAJS_VERSION=1.0.0-M5 + - SCALAJS_VERSION=1.0.0-M6 script: - ./scripts/assemble-cli.sh $SCALAJS_VERSION $TRAVIS_SCALA_VERSION cache: diff --git a/appveyor.yml b/appveyor.yml index 91d364c..d16c31e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: '{build}' os: Windows Server 2012 environment: global: - SCALAJS_VERSION: 1.0.0-M5 + SCALAJS_VERSION: 1.0.0-M6 matrix: - SCALA_VERSION: 2.11.12 - SCALA_VERSION: 2.12.6 diff --git a/build.sbt b/build.sbt index f1c6845..593ecf9 100644 --- a/build.sbt +++ b/build.sbt @@ -33,7 +33,7 @@ inThisBuild(Def.settings( scalaVersion := crossScalaVersions.value.head, scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"), - scalaJSVersion := "1.0.0-M5", + scalaJSVersion := "1.0.0-M6", scalaJSBinaryVersion := binaryScalaJSVersion(scalaJSVersion.value), scalaJSScalaVersions := Seq( From 6bd8454f854c634d418ea7ce783f9c7fa54c3dcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Sat, 20 Oct 2018 17:06:04 +0200 Subject: [PATCH 2/2] Add Scala 2.12.7 to the list of supported Scala versions. --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 593ecf9..f950911 100644 --- a/build.sbt +++ b/build.sbt @@ -53,6 +53,7 @@ inThisBuild(Def.settings( "2.12.4", "2.12.5", "2.12.6", + "2.12.7", ), homepage := Some(url("https://www.scala-js.org/")),