Skip to content

Commit 09c453a

Browse files
authored
Merge pull request #175 from gourlaysama/build/scalajs1
Add ScalaJS 1.0.0-M6 to the build
2 parents c3f8797 + 896b7ff commit 09c453a

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

.travis.yml

+5
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ env:
2222
matrix:
2323
- SCALAJS_VERSION=
2424
- SCALAJS_VERSION=0.6.25
25+
- SCALAJS_VERSION=1.0.0-M6
2526

2627
script:
2728
- echo $JAVA_HOME
@@ -49,6 +50,10 @@ matrix:
4950
exclude:
5051
- jdk: openjdk11
5152
env: SCALAJS_VERSION=0.6.25
53+
- jdk: openjdk11
54+
env: SCALAJS_VERSION=1.0.0-M6
55+
- scala: 2.11.12
56+
env: SCALAJS_VERSION=1.0.0-M6
5257
- scala: 2.11.12
5358
jdk: oraclejdk8
5459
- scala: 2.11.12

build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ lazy val `scala-parser-combinators` = crossProject(JSPlatform, JVMPlatform, Nati
1414
settings(
1515
name := "scala-parser-combinators",
1616
version := "1.1.2-SNAPSHOT",
17-
mimaPreviousVersion := Some("1.1.0"),
17+
mimaPreviousVersion := Some("1.1.0").filter(_ => System.getenv("SCALAJS_VERSION") != "1.0.0-M6"),
1818

1919
apiMappings += (scalaInstance.value.libraryJar ->
2020
url(s"https://www.scala-lang.org/api/${scalaVersion.value}/")),

0 commit comments

Comments
 (0)