From 83d6e39764103bde44d5812aa873ed7537cc8c97 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Sun, 3 Apr 2016 00:09:19 -0400 Subject: Implement alternative resolvers This commit also - requires Dependencies to explicitly implement canBeCached - unifies some logic for dependency downloading - moves SBT-like dependency DSL into its own trait - error message showing build directory for exceptions in builds Not splitting this up in favor of faster progress to 1.0. The user facing API can probably be slightly improved using implicits inside of BasicBuild, but we can do that later. --- build/build.scala | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'build') diff --git a/build/build.scala b/build/build.scala index aa5d27a..6dfd395 100644 --- a/build/build.scala +++ b/build/build.scala @@ -5,11 +5,10 @@ import scala.collection.immutable.Seq class Build(context: Context) extends BasicBuild(context){ // FIXME: somehow consolidate this with cbt's own boot-strapping from source. - override def dependencies = super.dependencies ++ Seq( - JavaDependency("org.scala-lang","scala-library",constants.scalaVersion), - JavaDependency("net.incongru.watchservice","barbary-watchservice","1.0"), - JavaDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r"), - JavaDependency("com.typesafe.zinc","zinc","0.3.9"), + override def dependencies = super.dependencies :+ MavenRepository.central.resolve( + MavenDependency("net.incongru.watchservice","barbary-watchservice","1.0"), + MavenDependency("org.eclipse.jgit", "org.eclipse.jgit", "4.2.0.201601211800-r"), + MavenDependency("com.typesafe.zinc","zinc","0.3.9"), ScalaDependency("org.scala-lang.modules","scala-xml","1.0.5") ) override def sources = Seq( -- cgit v1.2.3