diff options
author | Jakob Odersky <jodersky@gmail.com> | 2014-11-03 12:01:33 +0100 |
---|---|---|
committer | Jakob Odersky <jodersky@gmail.com> | 2014-11-03 12:01:33 +0100 |
commit | 850863823caf3c33e7f020d43877143ce8de00f5 (patch) | |
tree | 39be53ff02984f9bac8ed6d1729417c4069f4b78 /project/Build.scala | |
parent | d2dafd58ce910a9abb81360126834c64967cdfcd (diff) | |
download | mavigator-850863823caf3c33e7f020d43877143ce8de00f5.tar.gz mavigator-850863823caf3c33e7f020d43877143ce8de00f5.tar.bz2 mavigator-850863823caf3c33e7f020d43877143ce8de00f5.zip |
refactor build
Diffstat (limited to 'project/Build.scala')
-rw-r--r-- | project/Build.scala | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/project/Build.scala b/project/Build.scala index 678c8d2..fe249df 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -11,10 +11,8 @@ import Dependencies._ object ApplicationBuild extends Build { val common = Seq( - scalaVersion := "2.11.2", - scalacOptions ++= Seq("-feature"), - unmanagedSourceDirectories in Compile += (baseDirectory in ThisBuild).value / "vfd-shared" / "src" / "main" / "scala", - unmanagedResourceDirectories in Compile += (baseDirectory in ThisBuild).value / "vfd-shared" / "src" / "main" / "resources" + scalaVersion := "2.11.4", + scalacOptions ++= Seq("-feature", "-deprecation") ) lazy val root = Project("root", file(".")).aggregate( @@ -40,12 +38,12 @@ object ApplicationBuild extends Build { enablePlugins(PlayScala) settings(common: _*) settings( + relativeSourceMaps := true, resolvers += Resolver.url("scala-js-releases", url("http://dl.bintray.com/content/scala-js/scala-js-releases"))(Resolver.ivyStylePatterns), libraryDependencies ++= Seq( bootstrap, fontawesome, - jquery, - picklingPlay + jquery ) ) dependsOn(uav) @@ -60,8 +58,7 @@ object ApplicationBuild extends Build { libraryDependencies ++= Seq( rx, dom, - tag, - pickling + tag ) ) ) |