From 37a33d401fd70c56ff7f411afc07a4605e2e1aa2 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 10 Nov 2014 19:53:31 -0800 Subject: 0.2.3 --- build.sbt | 6 +++--- client/shared | 1 - example/project/build.properties | 2 +- example/src/main/scala/example/ScalaJSExample.scala | 2 +- project/build.sbt | 2 +- readme.md | 10 +++++++--- 6 files changed, 13 insertions(+), 10 deletions(-) delete mode 120000 client/shared diff --git a/build.sbt b/build.sbt index c963881..20618d4 100644 --- a/build.sbt +++ b/build.sbt @@ -9,7 +9,7 @@ val defaultSettings = Seq( lazy val root = project.in(file(".")).settings(defaultSettings:_*).settings( name := "workbench", - version := "0.2.2", + version := "0.2.3", organization := "com.lihaoyi", scalaVersion := "2.10.4", sbtPlugin := true, @@ -44,7 +44,7 @@ lazy val root = project.in(file(".")).settings(defaultSettings:_*).settings( "io.spray" % "spray-routing" % "1.3.1", "com.typesafe.akka" %% "akka-actor" % "2.3.0", "com.lihaoyi" %% "autowire" % "0.2.3", - "com.lihaoyi" %% "upickle" % "0.2.3" + "com.lihaoyi" %% "upickle" % "0.2.5" ), resolvers += "bintray/non" at "http://dl.bintray.com/non/maven" ) @@ -55,6 +55,6 @@ lazy val client = project.in(file("client")) libraryDependencies ++= Seq( "org.scala-lang.modules.scalajs" %%% "scalajs-dom" % "0.6", "com.lihaoyi" %%% "autowire" % "0.2.3", - "com.lihaoyi" %%% "upickle" % "0.2.3" + "com.lihaoyi" %%% "upickle" % "0.2.5" ) ) diff --git a/client/shared b/client/shared deleted file mode 120000 index 8fba6b6..0000000 --- a/client/shared +++ /dev/null @@ -1 +0,0 @@ -../shared \ No newline at end of file diff --git a/example/project/build.properties b/example/project/build.properties index 0974fce..be6c454 100644 --- a/example/project/build.properties +++ b/example/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.0 +sbt.version=0.13.5 diff --git a/example/src/main/scala/example/ScalaJSExample.scala b/example/src/main/scala/example/ScalaJSExample.scala index 40848a8..24b047e 100644 --- a/example/src/main/scala/example/ScalaJSExample.scala +++ b/example/src/main/scala/example/ScalaJSExample.scala @@ -20,7 +20,7 @@ object ScalaJSExample { .asInstanceOf[dom.CanvasRenderingContext2D] var p = Point(128, 128) - def color = "grey" + def color = "black" var enemiess = List.fill(10)(Point(util.Random.nextInt(255), util.Random.nextInt(255))) def clear() = { diff --git a/project/build.sbt b/project/build.sbt index 868e5e4..58178ec 100644 --- a/project/build.sbt +++ b/project/build.sbt @@ -1 +1 @@ -addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.3") +addSbtPlugin("org.scala-lang.modules.scalajs" % "scalajs-sbt-plugin" % "0.5.4") diff --git a/readme.md b/readme.md index 21e0463..52f7578 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,5 @@ -scala-js-workbench ------------------ +workbench 0.2.3 +--------------- ![Example](https://github.com/lihaoyi/scala-js-workbench/blob/master/Example.png?raw=true) @@ -20,7 +20,7 @@ resolvers += "spray repo" at "http://repo.spray.io" resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/" -addSbtPlugin("com.lihaoyi" % "workbench" % "0.2.2") +addSbtPlugin("com.lihaoyi" % "workbench" % "0.2.3") ``` - Add to your `build.sbt` ```scala @@ -136,6 +136,10 @@ Pull requests welcome! Change Log ---------- +##0.2.3 + +- Upgraded uPickle, removed need for special resolver + ##0.2.2 - First implementation of `spliceBrowsers` -- cgit v1.2.3