summaryrefslogtreecommitdiff
path: root/build.sbt
diff options
context:
space:
mode:
authorSébastien Doeraene <sjrdoeraene@gmail.com>2015-01-29 17:50:33 +0100
committerSébastien Doeraene <sjrdoeraene@gmail.com>2015-01-29 17:50:33 +0100
commit33129113b3ebf3dd656bd58c34af476fb852e2f6 (patch)
tree5b84193ecd9eefc05bd9f27b1766e833064182ae /build.sbt
parentea067baf2afe492cde8b10b88e9628812cb4d7cd (diff)
downloadhands-on-scala-js-33129113b3ebf3dd656bd58c34af476fb852e2f6.tar.gz
hands-on-scala-js-33129113b3ebf3dd656bd58c34af476fb852e2f6.tar.bz2
hands-on-scala-js-33129113b3ebf3dd656bd58c34af476fb852e2f6.zip
Upgrade and update the whole thing for Scala.js 0.6.0-RC2.
Both the builds, as well as the text of the book, have been completely updated for Scala.js 0.6.x.
Diffstat (limited to 'build.sbt')
-rw-r--r--build.sbt8
1 files changed, 1 insertions, 7 deletions
diff --git a/build.sbt b/build.sbt
index a1170c6..875b6de 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,9 +4,6 @@ import org.eclipse.jgit.api.Git
import org.eclipse.jgit.merge.MergeStrategy
import org.eclipse.jgit.transport.{UsernamePasswordCredentialsProvider, RefSpec}
-import scalajs.sbtplugin.ScalaJSPlugin._
-import ScalaJSKeys._
-
val cloneRepos = taskKey[Unit]("Clone stuff from github")
val sharedSettings = Seq(
@@ -27,10 +24,7 @@ lazy val book = Project(
"com.lihaoyi" %% "scalatex-site" % "0.1.1",
"com.lihaoyi" %% "ammonite" % "0.1.0"
),
- (resources in Compile) += {
- (fullOptJS in (demos, Compile)).value
- (artifactPath in (demos, Compile, fullOptJS)).value
- },
+ (resources in Compile) += (fullOptJS in (demos, Compile)).value.data,
(unmanagedResourceDirectories in Compile) ++=
(unmanagedResourceDirectories in (demos, Compile)).value,