Upgrade and update the whole thing for Scala.js 0.6.0-RC2.

Both the builds, as well as the text of the book, have been
completely updated for Scala.js 0.6.x.

15 files changed, 31 insertions, 46 deletions

diff --git a/examples/crossBuilds/clientserver/build.sbt b/examples/crossBuilds/clientserver/build.sbt
index 048df8a..e162ec4 100644
--- a/examples/crossBuilds/clientserver/build.sbt
+++ b/examples/crossBuilds/clientserver/build.sbt
@@ -1,23 +1,20 @@
 import NativePackagerKeys._
-import utest.jsrunner.JsCrossBuild
-import scalajs.sbtplugin.ScalaJSPlugin._
-import ScalaJSKeys._
 val sharedSettings = Seq(
   unmanagedSourceDirectories in Compile +=
     baseDirectory.value  / "shared" / "main" / "scala",
   libraryDependencies ++= Seq(
-    "com.scalatags" %%% "scalatags" % "0.4.2",
-    "com.lihaoyi" %%% "upickle" % "0.2.5"
+    "com.lihaoyi" %%% "scalatags" % "0.4.3-RC1",
+    "com.lihaoyi" %%% "upickle" % "0.2.6-RC1"
   ),
-  scalaVersion := "2.11.4"
+  scalaVersion := "2.11.5"
 )
 
 lazy val client = project.in(file("client"))
-                         .settings(scalaJSSettings:_*)
+                         .enablePlugins(ScalaJSPlugin)
                          .settings(sharedSettings:_*)
                          .settings(
   libraryDependencies ++= Seq(
-    "org.scala-lang.modules.scalajs" %%% "scalajs-dom" % "0.6"
+    "org.scala-js" %%% "scalajs-dom" % "0.7.0"
   )
 )
 
@@ -30,9 +27,6 @@ lazy val server = project.in(file("server"))
     "io.spray" %% "spray-routing" % "1.3.2",
     "com.typesafe.akka" %% "akka-actor" % "2.3.6"
   ),
-  (resources in Compile) += {
-    (fastOptJS in (client, Compile)).value
-    (artifactPath in (client, Compile, fastOptJS)).value
-  }
+  (resources in Compile) += (fastOptJS in (client, Compile)).value.data
 )
 
diff --git a/examples/crossBuilds/clientserver/project/build.sbt b/examples/crossBuilds/clientserver/project/build.sbt
index c24e2b0..2336450 100644
--- a/examples/crossBuilds/clientserver/project/build.sbt
+++ b/examples/crossBuilds/clientserver/project/build.sbt
@@ -1,6 +1,4 @@
 /*project/build.sbt*/
-addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.5")
-
-addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.2.4")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-RC2")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.7.4")
diff --git a/examples/crossBuilds/clientserver/server/src/main/scala/simple/Page.scala b/examples/crossBuilds/clientserver/server/src/main/scala/simple/Page.scala
index d657290..19ed953 100644
--- a/examples/crossBuilds/clientserver/server/src/main/scala/simple/Page.scala
+++ b/examples/crossBuilds/clientserver/server/src/main/scala/simple/Page.scala
@@ -3,7 +3,7 @@ import scalatags.Text.all._
 
 object Page{
   val boot =
-    "Client().main(document.getElementById('contents'))"
+    "simple.Client().main(document.getElementById('contents'))"
   val skeleton =
     html(
       head(
diff --git a/examples/crossBuilds/clientserver2/build.sbt b/examples/crossBuilds/clientserver2/build.sbt
index 4c5045f..c5c020c 100644
--- a/examples/crossBuilds/clientserver2/build.sbt
+++ b/examples/crossBuilds/clientserver2/build.sbt
@@ -1,23 +1,20 @@
-import utest.jsrunner.JsCrossBuild
-import scalajs.sbtplugin.ScalaJSPlugin._
-import ScalaJSKeys._
 val sharedSettings = Seq(
   unmanagedSourceDirectories in Compile +=
     baseDirectory.value  / "shared" / "main" / "scala",
   libraryDependencies ++= Seq(
-    "com.scalatags" %%% "scalatags" % "0.4.2",
-    "com.lihaoyi" %%% "upickle" % "0.2.5",
-    "com.lihaoyi" %%% "autowire" % "0.2.3"
+    "com.lihaoyi" %%% "scalatags" % "0.4.3-RC1",
+    "com.lihaoyi" %%% "upickle" % "0.2.6-RC1",
+    "com.lihaoyi" %%% "autowire" % "0.2.4-RC1"
   ),
-  scalaVersion := "2.11.4"
+  scalaVersion := "2.11.5"
 )
 
 lazy val client = project.in(file("client"))
-                         .settings(scalaJSSettings:_*)
+                         .enablePlugins(ScalaJSPlugin)
                          .settings(sharedSettings:_*)
                          .settings(
   libraryDependencies ++= Seq(
-    "org.scala-lang.modules.scalajs" %%% "scalajs-dom" % "0.6"
+    "org.scala-js" %%% "scalajs-dom" % "0.7.0"
   )
 )
 
@@ -29,9 +26,6 @@ lazy val server = project.in(file("server"))
     "io.spray" %% "spray-routing" % "1.3.2",
     "com.typesafe.akka" %% "akka-actor" % "2.3.6"
   ),
-  (resources in Compile) += {
-    (fastOptJS in (client, Compile)).value
-    (artifactPath in (client, Compile, fastOptJS)).value
-  }
+  (resources in Compile) += (fastOptJS in (client, Compile)).value.data
 )
 
diff --git a/examples/crossBuilds/clientserver2/project/build.properties b/examples/crossBuilds/clientserver2/project/build.properties
new file mode 100644
index 0000000..748703f
--- /dev/null
+++ b/examples/crossBuilds/clientserver2/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.13.7
diff --git a/examples/crossBuilds/clientserver2/project/build.sbt b/examples/crossBuilds/clientserver2/project/build.sbt
index 7c60a91..f969143 100644
--- a/examples/crossBuilds/clientserver2/project/build.sbt
+++ b/examples/crossBuilds/clientserver2/project/build.sbt
@@ -1,5 +1,3 @@
 /*project/build.sbt*/
-addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.5")
-
-addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.2.4")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-RC2")
 
diff --git a/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Page.scala b/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Page.scala
index ce6617c..9b21b5a 100644
--- a/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Page.scala
+++ b/examples/crossBuilds/clientserver2/server/src/main/scala/simple/Page.scala
@@ -3,7 +3,7 @@ import scalatags.Text.all._
 
 object Page{
   val boot =
-    "Client().main(document.getElementById('contents'))"
+    "simple.Client().main(document.getElementById('contents'))"
   val skeleton =
     html(
       head(
diff --git a/examples/crossBuilds/simple/build.sbt b/examples/crossBuilds/simple/build.sbt
index f1cda7e..ce296c4 100644
--- a/examples/crossBuilds/simple/build.sbt
+++ b/examples/crossBuilds/simple/build.sbt
@@ -3,7 +3,7 @@ val sharedSettings = Seq(
     baseDirectory.value  / "shared" / "main" / "scala"
 )
 
-lazy val js = project.in(file("js")).settings(scalaJSSettings:_*)
+lazy val js = project.in(file("js")).enablePlugins(ScalaJSPlugin)
                                     .settings(sharedSettings:_*)
 
 lazy val jvm = project.in(file("jvm")).settings(sharedSettings:_*)
\ No newline at end of file
diff --git a/examples/crossBuilds/simple/project/build.properties b/examples/crossBuilds/simple/project/build.properties
new file mode 100644
index 0000000..748703f
--- /dev/null
+++ b/examples/crossBuilds/simple/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.13.7
diff --git a/examples/crossBuilds/simple/project/build.sbt b/examples/crossBuilds/simple/project/build.sbt
index a1dbd1d..b42401a 100644
--- a/examples/crossBuilds/simple/project/build.sbt
+++ b/examples/crossBuilds/simple/project/build.sbt
@@ -1,2 +1,2 @@
 /*project/build.sbt*/
-addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.5")
\ No newline at end of file
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-RC2")
diff --git a/examples/crossBuilds/simple2/project/build.properties b/examples/crossBuilds/simple2/project/build.properties
new file mode 100644
index 0000000..748703f
--- /dev/null
+++ b/examples/crossBuilds/simple2/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.13.7
diff --git a/examples/crossBuilds/simple2/project/build.sbt b/examples/crossBuilds/simple2/project/build.sbt
index 5bd83ce..a1be3f8 100644
--- a/examples/crossBuilds/simple2/project/build.sbt
+++ b/examples/crossBuilds/simple2/project/build.sbt
@@ -1,4 +1,4 @@
 /*project/build.sbt*/
-addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.5")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.0-RC2")
 
-addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.2.4")
\ No newline at end of file
+addSbtPlugin("com.lihaoyi" % "utest-js-plugin" % "0.2.5-RC1")
diff --git a/examples/demos/build.sbt b/examples/demos/build.sbt
index 0db3dec..7b0d9e1 100644
--- a/examples/demos/build.sbt
+++ b/examples/demos/build.sbt
@@ -1,8 +1,6 @@
-import scalajs.sbtplugin.ScalaJSPlugin.ScalaJSKeys._
-
 (emitSourceMaps in fullOptJS) := false
 
-scalaJSSettings
+enablePlugins(ScalaJSPlugin)
 
 name := "Example"
 
@@ -12,12 +10,12 @@ scalaVersion := "2.11.4"
 
 libraryDependencies += "com.lihaoyi" %% "acyclic" % "0.1.2" % "provided"
 
-libraryDependencies += "com.lihaoyi" %%% "upickle" % "0.2.5"
+libraryDependencies += "com.lihaoyi" %%% "upickle" % "0.2.6-RC1"
 
-libraryDependencies += "org.scala-lang.modules.scalajs" %%% "scalajs-dom" % "0.6"
+libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "0.7.0"
 
-libraryDependencies += "com.scalatags" %%% "scalatags" % "0.4.2"
+libraryDependencies += "com.lihaoyi" %%% "scalatags" % "0.4.3-RC1"
 
-libraryDependencies += "com.scalarx" %%% "scalarx" % "0.2.6"
+libraryDependencies += "com.lihaoyi" %%% "scalarx" % "0.2.7-RC1"
 
 libraryDependencies += "org.scala-lang.modules" %% "scala-async" % "0.9.2"
\ No newline at end of file
diff --git a/examples/demos/src/main/scala/scrollmenu/Controller.scala b/examples/demos/src/main/scala/scrollmenu/Controller.scala
index b56da31..cfef7b0 100644
--- a/examples/demos/src/main/scala/scrollmenu/Controller.scala
+++ b/examples/demos/src/main/scala/scrollmenu/Controller.scala
@@ -23,7 +23,7 @@ object Controller{
 
     val Seq(main, menu, layout, menuLink) = Seq(
       "main", "menu", "layout", "menuLink"
-    ).map(dom.document.getElementById)
+    ).map(dom.document.getElementById(_).asInstanceOf[dom.HTMLElement])
 
     val snippets = dom.document.getElementsByClassName("highlight-me")
 
diff --git a/examples/demos/src/main/scala/scrollmenu/ScrollSpy.scala b/examples/demos/src/main/scala/scrollmenu/ScrollSpy.scala
index f0b9dd4..9a64314 100644
--- a/examples/demos/src/main/scala/scrollmenu/ScrollSpy.scala
+++ b/examples/demos/src/main/scala/scrollmenu/ScrollSpy.scala
@@ -57,7 +57,7 @@ class ScrollSpy(structure: Tree[String],
     }
 
     js.Array(
-      menuItems.map(name => dom.document.getElementById(Controller.munge(name)))
+      menuItems.map(name => dom.document.getElementById(Controller.munge(name)).asInstanceOf[dom.HTMLElement])
                .map((el) => () => offset(el, main)):_*
     )
   }