From 97d9504358927f5b2366930f389c8d07d2a7229b Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 14 May 2017 11:34:47 +0800 Subject: [PATCH] update readme/manual-testing to scala 2.12.2, which reduces readme code size from 1.5m to 1.3m --- build.sbt | 4 ++-- demo/src/main/scala/demo/DemoMain.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index a0af5f0b..c9f0a7bd 100644 --- 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 index 26bdf314..7c5826ed 100644 --- 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,