Skip to content

Commit 3d98110

Browse files
authored
Merge pull request #300 from xerial/scalajs1.0.0
Upgrade Scala.js to 1.0.0
2 parents 471fce0 + 63c1f86 commit 3d98110

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

.travis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ scala:
1010
- 2.13.1
1111

1212
env:
13-
- SCALAJS_VERSION= ADOPTOPENJDK=8
14-
- SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8
15-
- SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8
16-
- SCALAJS_VERSION= ADOPTOPENJDK=11
17-
- SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=11
18-
- SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=11
13+
- SCALAJS_VERSION= ADOPTOPENJDK=8
14+
- SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8
15+
- SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=8
16+
- SCALAJS_VERSION= ADOPTOPENJDK=11
17+
- SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=11
18+
- SCALAJS_VERSION=1.0.0 ADOPTOPENJDK=11
1919

2020
matrix:
2121

build.sbt

+7-1
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.3")
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.3")
23+
}
1824
)
1925

2026
lazy val root = project

0 commit comments

Comments
 (0)