Upgrade to Scala.js 1.0.0-M7.

.travis.yml

@@ -2,11 +2,11 @@ sudo: false
 language: scala
 scala:
   - 2.11.12
-  - 2.12.6
+  - 2.12.8
 jdk:
   - oraclejdk8
 env:
-  - SCALAJS_VERSION=1.0.0-M6
+  - SCALAJS_VERSION=1.0.0-M7
 script:
   - ./scripts/assemble-cli.sh $SCALAJS_VERSION $TRAVIS_SCALA_VERSION
 cache:

appveyor.yml

@@ -2,10 +2,10 @@ version: '{build}'
 os: Windows Server 2012
 environment:
   global:
-    SCALAJS_VERSION: 1.0.0-M6
+    SCALAJS_VERSION: 1.0.0-M7
   matrix:
     - SCALA_VERSION: 2.11.12
-    - SCALA_VERSION: 2.12.6
+    - SCALA_VERSION: 2.12.8
 install:
   - cmd: choco install sbt --version 1.0.2 -ia "INSTALLDIR=""C:\sbt"""
   - cmd: SET PATH=C:\sbt\bin;%JAVA_HOME%\bin;%PATH%

build.sbt

@@ -29,11 +29,11 @@ inThisBuild(Def.settings(
   version := "1.0.0-SNAPSHOT",
   organization := "org.scala-js",
 
-  crossScalaVersions := Seq("2.12.6", "2.11.12"),
+  crossScalaVersions := Seq("2.12.8", "2.11.12"),
   scalaVersion := crossScalaVersions.value.head,
   scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
 
-  scalaJSVersion := "1.0.0-M6",
+  scalaJSVersion := "1.0.0-M7",
   scalaJSBinaryVersion := binaryScalaJSVersion(scalaJSVersion.value),
 
   scalaJSScalaVersions := Seq(
@@ -54,6 +54,7 @@ inThisBuild(Def.settings(
     "2.12.5",
     "2.12.6",
     "2.12.7",
+    "2.12.8",
   ),
 
   homepage := Some(url("https://www.scala-js.org/")),

src/main/scala/org/scalajs/cli/Scalajsld.scala

@@ -22,6 +22,10 @@ import CheckedBehavior.Compliant
 
 import scala.collection.immutable.Seq
 
+import scala.concurrent.Await
+import scala.concurrent.duration.Duration
+import scala.concurrent.ExecutionContext.Implicits.global
+
 import java.io.File
 import java.net.URI
 
@@ -172,8 +176,9 @@ object Scalajsld {
       val output = LinkerOutput(outFile)
       val cache = (new IRFileCache).newCache
 
-      linker.link(cache.cached(irContainers), moduleInitializers, output,
-          logger)
+      val future = linker.link(cache.cached(irContainers), moduleInitializers,
+          output, logger)
+      Await.result(future, Duration.Inf)
     }
   }
 }