From 08e4b96926a9a1933ad60a31f0c0e7218773c69b Mon Sep 17 00:00:00 2001 From: "Aaron S. Hawley" Date: Wed, 5 Feb 2020 16:10:35 -0500 Subject: [PATCH] Update to Scala.js 1.0.0 --- .circleci/config.yml | 8 ++++---- .travis.yml | 4 ++-- build.sbt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4b60b0d3a..a8f93adfc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -137,10 +137,10 @@ workflows: scala_version: 2.13.1 scalajs_version: 0.6.32 - scalajs_job: - name: sjs1.0.0-RC2_2.12 + name: sjs1.0_2.12 scala_version: 2.12.10 - scalajs_version: 1.0.0-RC2 + scalajs_version: 1.0.0 - scalajs_job: - name: sjs1.0.0-RC2_2.13 + name: sjs1.0_2.13 scala_version: 2.13.1 - scalajs_version: 1.0.0-RC2 + scalajs_version: 1.0.0 diff --git a/.travis.yml b/.travis.yml index 12c66e18d..527bb01d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ scala: env: - SCALAJS_VERSION= ADOPTOPENJDK=8 - SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8 - - SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8 + - SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=8 - SCALAJS_VERSION= ADOPTOPENJDK=11 - SCALAJS_VERSION= ADOPTOPENJDK=13 @@ -21,7 +21,7 @@ matrix: - scala: 0.22.0-RC1 env: SCALAJS_VERSION=0.6.32 ADOPTOPENJDK=8 - scala: 0.22.0-RC1 - env: SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8 + env: SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=8 install: - git fetch --tags # get all tags for sbt-dynver diff --git a/build.sbt b/build.sbt index 12c7078bb..9eee0e939 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-RC2") None // No such release yet + if (System.getenv("SCALAJS_VERSION") == "1.0.0") None // No such release yet else Some("1.2.0") }, mimaBinaryIssueFilters ++= {