Update scalajs versions, related dependencies and remove obsolete features

6 files changed, 11 insertions, 23 deletions

diff --git a/example/build.sbt b/example/build.sbt
index fed07bd..65f7ed2 100644
--- a/example/build.sbt
+++ b/example/build.sbt
@@ -1,25 +1,15 @@
-import com.lihaoyi.workbench.Plugin._
-
-// Turn this project into a Scala.js project by importing these settings
 enablePlugins(ScalaJSPlugin)
-
-workbenchSettings
+enablePlugins(WorkbenchPlugin)
 
 name := "Example"
 
-scalaVersion := "2.11.2"
+scalaVersion := "2.12.0"
 
 version := "0.1-SNAPSHOT"
 
-resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
-
 libraryDependencies ++= Seq(
-  "org.scala-js" %%% "scalajs-dom" % "0.8.0"
+  "org.scala-js" %%% "scalajs-dom" % "0.9.1"
 )
 
-bootSnippet := "ScalaJSExample().main();"
-
-disableOptimizer := true
-
+// (experimental feature)
 spliceBrowsers <<= spliceBrowsers.triggeredBy(fastOptJS in Compile)
-
diff --git a/example/project/build.properties b/example/project/build.properties
index 748703f..27e88aa 100644
--- a/example/project/build.properties
+++ b/example/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.7
+sbt.version=0.13.13
diff --git a/example/project/build.sbt b/example/project/build.sbt
index f623fb6..2094cdd 100644
--- a/example/project/build.sbt
+++ b/example/project/build.sbt
@@ -1,4 +1,3 @@
-
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.1")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
 
 lazy val root = project.in(file(".")).dependsOn(file("../.."))
diff --git a/example/src/main/resources/index-dev.html b/example/src/main/resources/index-dev.html
index 364241b..6f27812 100644
--- a/example/src/main/resources/index-dev.html
+++ b/example/src/main/resources/index-dev.html
@@ -14,7 +14,7 @@
 <script type="text/javascript" src="../example-fastopt.js"></script>
 
 <script>
-    ScalaJSExample().main();
+    example.ScalaJSExample().main();
 </script>
 </body>
 </html>
diff --git a/example/src/main/resources/index-opt.html b/example/src/main/resources/index-opt.html
index 5abb478..d8ad3ab 100644
--- a/example/src/main/resources/index-opt.html
+++ b/example/src/main/resources/index-opt.html
@@ -12,7 +12,7 @@
 
 <script type="text/javascript" src="../example-opt.js"></script>
 <script>
-    ScalaJSExample().main();
+    example.ScalaJSExample().main();
 </script>
 </body>
 </html>
diff --git a/example/src/main/scala/example/ScalaJSExample.scala b/example/src/main/scala/example/ScalaJSExample.scala
index 0255262..3298e4f 100644
--- a/example/src/main/scala/example/ScalaJSExample.scala
+++ b/example/src/main/scala/example/ScalaJSExample.scala
@@ -1,6 +1,7 @@
 package example
 import scala.scalajs.js.annotation.JSExport
 import org.scalajs.dom
+import org.scalajs.dom.html
 import scala.util.Random
 
 case class Point(x: Int, y: Int){
@@ -8,14 +9,12 @@ case class Point(x: Int, y: Int){
   def /(d: Int) = Point(x / d, y / d)
 }
 
-// Seems like you need this for sbt ~fastOptJS to work
-// mkdir ~/.sbt/0.13/plugins/target/scala-2.10/sbt-0.13/classes
 @JSExport
 object ScalaJSExample {
   val ctx =
     dom.document
        .getElementById("canvas")
-       .asInstanceOf[dom.HTMLCanvasElement]
+       .asInstanceOf[html.Canvas]
        .getContext("2d")
        .asInstanceOf[dom.CanvasRenderingContext2D]
 
@@ -41,6 +40,6 @@ object ScalaJSExample {
   }
   @JSExport
   def main(): Unit = {
-    dom.setInterval(() => run, 10)
+    dom.window.setInterval(() => run, 10)
   }
 }