diff options
| author | Jakob Odersky <jakob@odersky.com> | 2016-02-27 17:11:10 -0800 |
|---|---|---|
| committer | Jakob Odersky <jakob@odersky.com> | 2016-04-14 04:03:17 -0700 |
| commit | dae336ee5514970fee93b0db25ce272ab83bd3c7 (patch) | |
| tree | a628a7c02c6956d99510d98f2a0321be00b241bf /project | |
| parent | 773bc081728bf770281a22c1700d05b1def75542 (diff) | |
| download | mavigator-dae336ee5514970fee93b0db25ce272ab83bd3c7.tar.gz mavigator-dae336ee5514970fee93b0db25ce272ab83bd3c7.tar.bz2 mavigator-dae336ee5514970fee93b0db25ce272ab83bd3c7.zip | |
Refactor UI to a HUD-style interface
Diffstat (limited to 'project')
| -rw-r--r-- | project/Dependencies.scala | 4 | ||||
| -rw-r--r-- | project/Js.scala | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 7 |
3 files changed, 6 insertions, 7 deletions
diff --git a/project/Dependencies.scala b/project/Dependencies.scala index be6cbfe..ba39c94 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -19,8 +19,8 @@ object Dependencies { val flowNative = "com.github.jodersky" % "flow-native" % FlowVersion % Runtime val flowStream = "com.github.jodersky" % "flow-stream" % FlowVersion - val jsDom = Def.setting{"org.scala-js" %%% "scalajs-dom" % "0.8.2"} + val jsDom = Def.setting{"org.scala-js" %%% "scalajs-dom" % "0.9.0"} val scalatags = Def.setting{"com.lihaoyi" %%% "scalatags" % "0.5.4"} - val scalarx = Def.setting{"com.lihaoyi" %%% "scalarx" % "0.2.8"} + val scalarx = Def.setting{"com.lihaoyi" %%% "scalarx" % "0.3.1"} } diff --git a/project/Js.scala b/project/Js.scala index d665eab..9f85f3b 100644 --- a/project/Js.scala +++ b/project/Js.scala @@ -8,7 +8,7 @@ object Js { def dependsOnJs(proj: Project): Seq[Setting[_]] = Seq( resourceGenerators in Compile += Def.task{ - val js: File = (fullOptJS in (proj, Compile)).value.data + val js: File = (fastOptJS in (proj, Compile)).value.data val map = js.getParentFile / (js.name + ".map") val out = (resourceManaged in Compile).value / "assets" / "js" diff --git a/project/plugins.sbt b/project/plugins.sbt index 798db0c..301572f 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,19 +2,18 @@ * Additional resolvers */ -resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/" +//resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/" -resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven" +//resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven" resolvers += Resolver.jcenterRepo - /* * Main plugins */ // add support for scalajs -addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.6") +addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.8") // twirl html templating addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.1.1") |