diff --git a/.circleci/config.yml b/.circleci/config.yml index a8f93adfc..50d46720b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,8 +139,8 @@ workflows: - scalajs_job: name: sjs1.0_2.12 scala_version: 2.12.10 - scalajs_version: 1.0.0 + scalajs_version: 1.0.1 - scalajs_job: name: sjs1.0_2.13 scala_version: 2.13.1 - scalajs_version: 1.0.0 + scalajs_version: 1.0.1 diff --git a/.travis.yml b/.travis.yml index 005996ea0..0aefdf0bd 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 ADOPTOPENJDK=8 + - SCALAJS_VERSION=1.0.1 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 ADOPTOPENJDK=8 + env: SCALAJS_VERSION=1.0.1 ADOPTOPENJDK=8 install: - git fetch --tags # get all tags for sbt-dynver diff --git a/build.sbt b/build.sbt index 99452683a..684714ad9 100644 --- a/build.sbt +++ b/build.sbt @@ -43,8 +43,9 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) scalacOptions in Test += "-Xxml:coalescing", scalaModuleMimaPreviousVersion := { - if (System.getenv("SCALAJS_VERSION") == "1.0.0") None // No such release yet - else Some("1.2.0") + if (isDotty.value) None // No such release yet + // else if (System.getenv("SCALAJS_VERSION") == "1.0.0") None + else Some("1.3.0") }, mimaBinaryIssueFilters ++= { import com.typesafe.tools.mima.core._ @@ -161,6 +162,8 @@ lazy val xml = crossProject(JSPlatform, JVMPlatform) } ) .jsSettings( + // The config for Travis has an exclude, but sbt-travisci doesn't catch it. + crossScalaVersions -= "0.22.0-RC1", // Scala.js cannot run forked tests fork in Test := false )