Upgrading to latest Scala.js

fancellu · Sep 24, 2016 · c6fc414 · c6fc414
1 parent 6f7ff92
commit c6fc414
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/core/build.sbt b/core/build.sbt
@@ -2,13 +2,13 @@ name := "scalajs-flot"
 
 description := "Scala.js+Flot examples"
 
-version := "0.3"
+version := "0.4"
 
-scalaVersion := "2.11.7"
+scalaVersion := "2.11.8"
 
 libraryDependencies ++= Seq(
-  "org.scala-js" %%% "scalajs-dom" % "0.8.2",
-  "be.doeraene" %%% "scalajs-jquery" % "0.8.1" 
+  "org.scala-js" %%% "scalajs-dom" % "0.9.1",
+  "be.doeraene" %%% "scalajs-jquery" % "0.9.0" 
 )
 
 publishArtifact in packageDoc:= false

diff --git a/example/build.sbt b/example/build.sbt
@@ -4,6 +4,6 @@ workbenchSettings
 
 bootSnippet := "example.T1().main(document.getElementById('mydiv'));"
 
-scalaVersion := "2.11.7"
+scalaVersion := "2.11.8"
 
 publishArtifact:= false
diff --git a/example/src/main/resources/realtime-dev.html b/example/src/main/resources/realtime-dev.html
@@ -19,7 +19,7 @@
 
 <p>Realtime demo</p>
 <div id="placeholder"  style="width:1000px;height:400px"></div>
-<script type="text/javascript" src="../scala-js-flot-examples-fastopt.js"></script>
+<script type="text/javascript" src="../example-fastopt.js"></script>
 <script>
 
 <!--  flot end -->

diff --git a/example/src/main/resources/time1-dev.html b/example/src/main/resources/time1-dev.html
@@ -20,7 +20,7 @@
 
 <p>Time1 demo: Weather forecast for London</p>
 <div id="placeholder"  style="width:1000px;height:400px"></div>
-<script type="text/javascript" src="../scala-js-flot-examples-fastopt.js"></script>
+<script type="text/javascript" src="../example-fastopt.js"></script>
 <script>
 
 <!--  flot end -->

diff --git a/example/src/main/scala/example/RealTime.scala b/example/src/main/scala/example/RealTime.scala
@@ -43,6 +43,6 @@ object RealTime extends {
       currentPlot.draw()
     }
 
-    dom.setInterval(run _, 100)    
+    dom.window.setInterval(run _, 100)    
   }
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,5 +1,5 @@
 addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0")
 
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.5")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.12")
 
 addSbtPlugin("com.lihaoyi" % "workbench" % "0.2.3")