From bedfa98e5c44dec8dca2939fbe1d3b2fe832e163 Mon Sep 17 00:00:00 2001 From: Philippus Date: Sat, 22 Feb 2020 09:49:07 +0100 Subject: [PATCH] Update scala-js to 1.0.0 --- .travis.yml | 2 +- build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cba155aa..c2dea755 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ env: # The empty SCALAJS_VERSION will only compile for the JVM - SCALAJS_VERSION= - SCALAJS_VERSION=0.6.28 - - SCALAJS_VERSION=1.0.0-M8 + - SCALAJS_VERSION=1.0.0 matrix: include: diff --git a/build.sbt b/build.sbt index df6d6d26..53d301a8 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").filter(_ => System.getenv("SCALAJS_VERSION") != "1.0.0-M8"), + mimaPreviousVersion := Some("1.1.0").filter(_ => System.getenv("SCALAJS_VERSION") != "1.0.0"), apiMappings += (scalaInstance.value.libraryJar -> url(s"https://www.scala-lang.org/api/${scalaVersion.value}/")),