Turn sbt dependencies into "provided" ones

The dbuild plugins used to bring onto the classpath all sorts of
sbt libraries; the result was that multiple versions of the sbt
libraries would appear on the classpath, leading to bizarre
behaviour. The plugin will now use whatever sbt places on the
classpath, matching the sbt version in use.

In theory, this should fix scala/community-build#384 and may
help with sbt/sbt#1696

Author: Antonio Cunei

build.sbt

@@ -115,14 +115,14 @@ lazy val repo = (
   SubProj("repo")
   dependsOn(adapter, metadata, logging)
   dependsOnRemote(mvnAether, dispatch, aether, aetherApi, aetherSpi, aetherUtil, aetherImpl, aetherConnectorBasic, aetherFile, aetherHttp, aetherWagon, mvnAether)
-  dependsOnSbt(sbtIo, sbtLaunchInt)
+  dependsOnSbt(sbtIo, sbtLaunchInt, sbtLogging)
 )
 
 lazy val core = (
   SubProj("core")
   dependsOnRemote(javaMail)
   dependsOn(adapter,metadata, graph, hashing, logging, repo)
-  dependsOnSbt(sbtIo)
+  dependsOnSbt(sbtIo, sbtLogging)
 )
 
 lazy val proj = (
@@ -195,7 +195,7 @@ lazy val build = (
   dependsOn(actorProj, support, supportGit, repo, metadata, deploy, proj)
   dependsOnRemote(aws, uriutil, dispatch, jsch, oro, scallop, commonsLang)
   dependsOnRemote(gpgLibIf210:_*)
-  dependsOnSbt(sbtLaunchInt, sbtLauncher)
+  dependsOnSbt(sbtLaunchInt, sbtLauncher, sbtLogging, sbtIo)
   settings(skip211:_*)
   settings(SbtSupport.settings:_*)
   settings(

build/src/main/scala/com/typesafe/dbuild/build/Comparison.scala

@@ -4,6 +4,7 @@ import sbt._
 import com.typesafe.dbuild.adapter.Adapter
 import Adapter.{IO,allPaths}
 import Adapter.syntaxio._
+import Adapter.Path._
 import com.typesafe.dbuild.model._
 import com.typesafe.dbuild.logging.Logger
 import java.io.File

build/src/main/scala/com/typesafe/dbuild/build/DeployBuild.scala

@@ -5,6 +5,7 @@ import com.typesafe.dbuild.adapter.Adapter
 import Adapter.IO
 import Adapter.syntaxio._
 import Adapter.allPaths
+import Adapter.Path._
 import com.typesafe.dbuild.model._
 import com.typesafe.dbuild.repo.core._
 import java.io.File

deploy/src/main/scala/com/typesafe/dbuild/deploy/Deploy.scala

@@ -18,6 +18,7 @@ import com.typesafe.dbuild.adapter.Adapter
 import Adapter.{IO,Logger,allPaths}
 import Adapter.syntaxio._
 import com.lambdaworks.jacks.JacksMapper
+import Adapter.Path._
 
 /**
  * A generic (S3, http, https, etc) deploy location.

project/RemoteDepHelper.scala

@@ -1,14 +1,15 @@
 import sbt._
 import Keys._
 import Dependencies._
+import extra.syntax._
 
 // DSL for adding remote deps like local deps.
 class RemoteDepHelper(p: Project) {
   def dependsOnRemote(ms: ModuleID*): Project = p.settings(libraryDependencies ++= ms)
   def dependsOnSbt(ms: (String=>ModuleID)*): Project =
     p.settings(libraryDependencies ++= {
       val v = sbtVersion.value
-      ms map {_(v)}
+      ms map { _(v) % "provided"}
     })
 }
 object RemoteDepHelper {

project/src/main/scala-2.10/Dependencies.scala

@@ -11,7 +11,7 @@ object Dependencies extends CommonDependencies {
   def sbtIo(v:String)        = "org.scala-sbt" % "io" % v
   def sbtIvy(v:String)       = "org.scala-sbt" % "ivy" % v
   def sbtLogging(v:String)   = "org.scala-sbt" % "logging" % v
-  def sbtLaunchInt(v:String) = "org.scala-sbt" % "launcher" % v % "provided"
+  def sbtLaunchInt(v:String) = "org.scala-sbt" % "launcher" % v
   def sbtLauncher(v:String)  = "org.scala-sbt" % "launcher" % v
   def sbtSbt(v:String)       = "org.scala-sbt" % "sbt" % v
 

project/src/main/scala-2.10/syntax.scala

@@ -0,0 +1,2 @@
+object extra {val syntax = new {}}
+

project/src/main/scala-2.11/Dependencies.scala

@@ -11,7 +11,7 @@ object Dependencies extends CommonDependencies {
   def sbtIo(v:String)        = "org.scala-sbt" %% "io" % "1.0.0-M6"
   def sbtIvy(v:String)       = "org.scala-sbt" %% "librarymanagement" % "0.1.0-M12"
   def sbtLogging(v:String)   = "org.scala-sbt" %% "util-logging" % "0.1.0-M14"
-  def sbtLaunchInt(v:String) = "org.scala-sbt" % "launcher" % "1.0.0" % "provided"
+  def sbtLaunchInt(v:String) = "org.scala-sbt" % "launcher" % "1.0.0"
   def sbtLauncher(v:String)  = "org.scala-sbt" % "launcher" % "1.0.0"
   def sbtSbt(v:String)       = "org.scala-sbt" % "sbt" % v
 

project/src/main/scala-2.11/syntax.scala

@@ -0,0 +1,2 @@
+object extra {val syntax = sbt.syntax}
+