Skip to content

Commit d709919

Browse files
authored
Merge pull request #266 from scala/update/scala-js-1.0.0-backport
Update scala-js to 1.0.0
2 parents fc94acb + bedfa98 commit d709919

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
# The empty SCALAJS_VERSION will only compile for the JVM
2222
- SCALAJS_VERSION=
2323
- SCALAJS_VERSION=0.6.28
24-
- SCALAJS_VERSION=1.0.0-M8
24+
- SCALAJS_VERSION=1.0.0
2525

2626
matrix:
2727
include:

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").filter(_ => System.getenv("SCALAJS_VERSION") != "1.0.0-M8"),
17+
mimaPreviousVersion := Some("1.1.0").filter(_ => System.getenv("SCALAJS_VERSION") != "1.0.0"),
1818

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

0 commit comments

Comments
 (0)