Merge pull request #300 from xerial/scalajs1.0.0

Upgrade Scala.js to 1.0.0
scala · Feb 5, 2020 · 3d98110 · 3d98110
2 parents 471fce0 + 63c1f86
commit 3d98110
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,12 +10,12 @@ scala:
   - 2.13.1
 
 env:
-  - SCALAJS_VERSION=          ADOPTOPENJDK=8
-  - SCALAJS_VERSION=0.6.31    ADOPTOPENJDK=8
-  - SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=8
-  - SCALAJS_VERSION=          ADOPTOPENJDK=11
-  - SCALAJS_VERSION=0.6.31    ADOPTOPENJDK=11
-  - SCALAJS_VERSION=1.0.0-RC2 ADOPTOPENJDK=11
+  - SCALAJS_VERSION=       ADOPTOPENJDK=8
+  - SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=8
+  - SCALAJS_VERSION=1.0.0  ADOPTOPENJDK=8
+  - SCALAJS_VERSION=       ADOPTOPENJDK=11
+  - SCALAJS_VERSION=0.6.31 ADOPTOPENJDK=11
+  - SCALAJS_VERSION=1.0.0  ADOPTOPENJDK=11
 
 matrix:
 

diff --git a/build.sbt b/build.sbt
@@ -14,7 +14,13 @@ lazy val commonSettings = Seq(
                                                  |See the NOTICE file distributed with this work for
                                                  |additional information regarding copyright ownership.
                                                  |""".stripMargin)),
-  scalaModuleMimaPreviousVersion := Some("2.1.3")
+  scalaModuleMimaPreviousVersion := {
+    // We need to create a release version first to use MiMa
+    if(sys.env.get("SCALAJS_VERSION").exists(_.startsWith("1.0.0")))
+      None
+    else
+      Some("2.1.3")
+  }
 )
 
 lazy val root = project