From 896b7ff08b760b619275e89b7dc84cc77077c04a Mon Sep 17 00:00:00 2001 From: Antoine Gourlay Date: Wed, 7 Nov 2018 17:35:08 +0100 Subject: [PATCH] Add ScalaJS 1.0.0-M6 to the build --- .travis.yml | 5 +++++ build.sbt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index be6aed63..8386ab97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,6 +22,7 @@ env: matrix: - SCALAJS_VERSION= - SCALAJS_VERSION=0.6.25 + - SCALAJS_VERSION=1.0.0-M6 script: - echo $JAVA_HOME @@ -49,6 +50,10 @@ matrix: exclude: - jdk: openjdk11 env: SCALAJS_VERSION=0.6.25 + - jdk: openjdk11 + env: SCALAJS_VERSION=1.0.0-M6 + - scala: 2.11.12 + env: SCALAJS_VERSION=1.0.0-M6 - scala: 2.11.12 jdk: oraclejdk8 - scala: 2.11.12 diff --git a/build.sbt b/build.sbt index cb75b228..01f765e6 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, Nati settings( name := "scala-parser-combinators", version := "1.1.2-SNAPSHOT", - mimaPreviousVersion := Some("1.1.0"), + mimaPreviousVersion := Some("1.1.0").filter(_ => System.getenv("SCALAJS_VERSION") != "1.0.0-M6"), apiMappings += (scalaInstance.value.libraryJar -> url(s"https://www.scala-lang.org/api/${scalaVersion.value}/")),