From b32d3910b6cb150a7e0460b3d407565e788b9264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= <sjrdoeraene@gmail.com>
Date: Thu, 1 Feb 2018 11:46:50 +0100
Subject: [PATCH] Upgrade to Scala.js 1.0.0-M3.

---
 .travis.yml                                    |  2 +-
 build.sbt                                      |  4 ++--
 src/main/scala/org/scalajs/cli/Scalajsld.scala | 12 +++++++-----
 src/main/scala/org/scalajs/cli/Scalajsp.scala  | 12 +++++++-----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 929c43e..b64e6f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ scala:
 jdk:
   - oraclejdk8
 env:
-  - SCALAJS_VERSION=1.0.0-M2
+  - SCALAJS_VERSION=1.0.0-M3
 script:
   - ./scripts/assemble-cli.sh $SCALAJS_VERSION $TRAVIS_SCALA_VERSION
 cache:
diff --git a/build.sbt b/build.sbt
index 08fd12e..94f625b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -33,7 +33,7 @@ inThisBuild(Def.settings(
   scalaVersion := crossScalaVersions.value.head,
   scalacOptions ++= Seq("-deprecation", "-feature", "-Xfatal-warnings"),
 
-  scalaJSVersion := "1.0.0-M2",
+  scalaJSVersion := "1.0.0-M3",
   scalaJSBinaryVersion := binaryScalaJSVersion(scalaJSVersion.value),
 
   scalaJSScalaVersions := Seq(
@@ -98,7 +98,7 @@ lazy val `scalajs-cli`: Project = project.in(file(".")).
     commonSettings,
 
     libraryDependencies ++= Seq(
-      "org.scala-js" %% "scalajs-tools" % scalaJSVersion.value,
+      "org.scala-js" %% "scalajs-linker" % scalaJSVersion.value,
       "com.github.scopt" %% "scopt" % "3.5.0",
     ),
 
diff --git a/src/main/scala/org/scalajs/cli/Scalajsld.scala b/src/main/scala/org/scalajs/cli/Scalajsld.scala
index ef53b80..8acd63f 100644
--- a/src/main/scala/org/scalajs/cli/Scalajsld.scala
+++ b/src/main/scala/org/scalajs/cli/Scalajsld.scala
@@ -9,13 +9,15 @@
 
 package org.scalajs.cli
 
-import org.scalajs.core.ir.ScalaJSVersions
+import org.scalajs.ir.ScalaJSVersions
 
-import org.scalajs.core.tools.io._
-import org.scalajs.core.tools.logging._
+import org.scalajs.io._
 
-import org.scalajs.core.tools.linker._
-import org.scalajs.core.tools.linker.standard._
+import org.scalajs.logging._
+
+import org.scalajs.linker._
+import org.scalajs.linker.irio._
+import org.scalajs.linker.standard._
 
 import CheckedBehavior.Compliant
 
diff --git a/src/main/scala/org/scalajs/cli/Scalajsp.scala b/src/main/scala/org/scalajs/cli/Scalajsp.scala
index e63b4a8..a513ab2 100644
--- a/src/main/scala/org/scalajs/cli/Scalajsp.scala
+++ b/src/main/scala/org/scalajs/cli/Scalajsp.scala
@@ -9,12 +9,14 @@
 
 package org.scalajs.cli
 
-import org.scalajs.core.ir
-import ir.ScalaJSVersions
-import ir.Trees.{Tree, ClassDef}
-import ir.Printers.IRTreePrinter
+import org.scalajs.ir.ScalaJSVersions
+import org.scalajs.ir.Trees.{Tree, ClassDef}
+import org.scalajs.ir.Printers.IRTreePrinter
+
+import org.scalajs.io._
+
+import org.scalajs.linker.irio._
 
-import org.scalajs.core.tools.io._
 import scala.collection.immutable.Seq
 
 import java.io.{Console => _, _}