update readme/manual-testing to scala 2.12.2, which reduces readme co…

…de size from 1.5m to 1.3m
com-lihaoyi · May 14, 2017 · 97d9504 · 97d9504
1 parent cda2d97
commit 97d9504
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.sbt b/build.sbt
@@ -28,7 +28,7 @@ val shared = Seq(
   scalaJSStage in Global := FullOptStage,
   organization := "com.lihaoyi",
   version := _root_.fastparse.Constants.version,
-  scalaVersion := "2.11.8",
+  scalaVersion := "2.12.2",
   libraryDependencies += "com.lihaoyi" %% "acyclic" % "0.1.5" % "provided",
   addCompilerPlugin("com.lihaoyi" %% "acyclic" % "0.1.5"),
   autoCompilerPlugins := true,
@@ -222,7 +222,7 @@ lazy val demo = project.enablePlugins(ScalaJSPlugin)
   .settings(shared:_*)
   .settings(
     libraryDependencies += "org.scala-js" %%% "scalajs-dom" % "0.8.2",
-    libraryDependencies += "com.lihaoyi" %%% "scalatags" % "0.5.3",
+    libraryDependencies += "com.lihaoyi" %%% "scalatags" % "0.6.5",
     emitSourceMaps := false,
     publishArtifact := false,
     publishTo := Some(Resolver.file("Unused transient repository", file("target/unusedrepo")))

diff --git a/demo/src/main/scala/demo/DemoMain.scala b/demo/src/main/scala/demo/DemoMain.scala
@@ -155,7 +155,7 @@ object DemoMain {
           for(track <- remaining) track.savedTicks += tillNext
           assert(remaining.exists(_.tillNext == 0))
           logs.append("Sleeping:\t" + milliSleep + "ms")
-          dom.setTimeout(() => tick(), milliSleep)
+          dom.window.setTimeout(() => tick(), milliSleep)
           false
         }else{
           // `remaining` is empty, nothing left to continue playing,