From e82662695a366b33b25f7010924c11ae5d8c53f1 Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Wed, 4 Dec 2019 00:27:21 -0500 Subject: [PATCH] Update Scala.js to 1.0.0-RC1 --- .circleci/config.yml | 8 ++++---- .travis.yml | 6 +++--- build.sbt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 213aa6208..dbc0258ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -107,10 +107,10 @@ workflows: scala_version: 2.13.1 scalajs_version: 0.6.31 - scalajs_job: - name: sjs1.0.0-M8_2.12 + name: sjs1.0.0-RC1_2.12 scala_version: 2.12.10 - scalajs_version: 1.0.0-M8 + scalajs_version: 1.0.0-RC1 - scalajs_job: - name: sjs1.0.0-M8_2.13 + name: sjs1.0.0-RC1_2.13 scala_version: 2.13.1 - scalajs_version: 1.0.0-M8 + scalajs_version: 1.0.0-RC1 diff --git a/.travis.yml b/.travis.yml index 9b507a7a9..7c3995bdd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,15 +12,15 @@ scala: env: - SCALAJS_VERSION= ADOPTOPENJDK=8 - SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8 - - SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8 + - SCALAJS_VERSION=1.0.0-RC1 ADOPTOPENJDK=8 - SCALAJS_VERSION= ADOPTOPENJDK=11 matrix: exclude: - scala: 0.20.0-RC1 - env: SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8 + env: SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8 - scala: 0.20.0-RC1 - env: SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8 + env: SCALAJS_VERSION=1.0.0-RC1 ADOPTOPENJDK=8 install: - git fetch --tags # get all tags for sbt-dynver diff --git a/build.sbt b/build.sbt index 8edca710d..48bfacc12 100644 --- a/build.sbt +++ b/build.sbt @@ -43,7 +43,7 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) scalacOptions in Test += "-Xxml:coalescing", scalaModuleMimaPreviousVersion := { - if (System.getenv("SCALAJS_VERSION") == "1.0.0-M8") None // No such release yet + if (System.getenv("SCALAJS_VERSION") == "1.0.0-RC1") None // No such release yet else Some("1.2.0") }, mimaBinaryIssueFilters ++= {