Skip to content

Commit ec2702a

Browse files
authored
Merge pull request #268 from xerial/patch-1
Build for Scala.js 1.0.0-RC1
2 parents a802e92 + 03be45f commit ec2702a

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ scala:
66
- 2.13.0
77

88
env:
9-
- SCALAJS_VERSION= ADOPTOPENJDK=8
10-
- SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8
11-
- SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=8
12-
- SCALAJS_VERSION= ADOPTOPENJDK=11
13-
- SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=11
14-
- SCALAJS_VERSION=1.0.0-M8 ADOPTOPENJDK=11
9+
- SCALAJS_VERSION= ADOPTOPENJDK=8
10+
- SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8
11+
- SCALAJS_VERSION=1.0.0-RC1 ADOPTOPENJDK=8
12+
- SCALAJS_VERSION= ADOPTOPENJDK=11
13+
- SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=11
14+
- SCALAJS_VERSION=1.0.0-RC1 ADOPTOPENJDK=11
1515

1616
matrix:
1717

build.sbt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,13 @@ lazy val commonSettings = Seq(
1414
|See the NOTICE file distributed with this work for
1515
|additional information regarding copyright ownership.
1616
|""".stripMargin)),
17-
scalaModuleMimaPreviousVersion := Some("2.1.1"),
17+
scalaModuleMimaPreviousVersion := {
18+
// We need to create a release version first to use MiMa
19+
if(sys.env.get("SCALAJS_VERSION").exists(_.startsWith("1.0.0-")))
20+
None
21+
else
22+
Some("2.1.1")
23+
}
1824
)
1925

2026
lazy val root = project

0 commit comments

Comments
 (0)