luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try putting httpclient on sbt's classpath. Seems to speed up Ivy a bit.

This commit is contained in:
Mark Harrah 2011-06-11 20:09:15 -04:00
parent b97eb58396
commit c76a1c032f
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
project/Sbt.scala
View File

@ -1,6 +1,5 @@
// TODO(high): proper incremental xsbt.version.properties generation // TODO(high): proper incremental xsbt.version.properties generation
// TODO(low): proper generated API sources caching: doesn't detect output directory change // TODO(low): proper generated API sources caching: doesn't detect output directory change
// TODO: fix discovery/test
import sbt._ import sbt._
import Keys._ import Keys._
@ -73,7 +72,7 @@ object Sbt extends Build
/***** Intermediate-level Modules *****/ /***** Intermediate-level Modules *****/
// Apache Ivy integration // Apache Ivy integration
lazy val ivySub = baseProject(file("ivy"), "Ivy") dependsOn(interfaceSub, launchInterfaceSub, logSub % "compile;test->test", ioSub % "compile;test->test", launchSub % "test->test") settings(ivy, jsch) lazy val ivySub = baseProject(file("ivy"), "Ivy") dependsOn(interfaceSub, launchInterfaceSub, logSub % "compile;test->test", ioSub % "compile;test->test", launchSub % "test->test") settings(ivy, jsch, httpclient, excludeJUnit)
// Runner for uniform test interface // Runner for uniform test interface
lazy val testingSub = baseProject(file("testing"), "Testing") dependsOn(ioSub, classpathSub, logSub) settings(libraryDependencies += "org.scala-tools.testing" % "test-interface" % "0.5") lazy val testingSub = baseProject(file("testing"), "Testing") dependsOn(ioSub, classpathSub, logSub) settings(libraryDependencies += "org.scala-tools.testing" % "test-interface" % "0.5")

2
project/Util.scala
View File

@ -68,9 +68,11 @@ object Common
lazy val jlineDep = "jline" % "jline" % "0.9.94" intransitive() lazy val jlineDep = "jline" % "jline" % "0.9.94" intransitive()
lazy val jline = lib(jlineDep) lazy val jline = lib(jlineDep)
lazy val ivy = lib("org.apache.ivy" % "ivy" % "2.2.0") lazy val ivy = lib("org.apache.ivy" % "ivy" % "2.2.0")
lazy val httpclient = lib("commons-httpclient" % "commons-httpclient" % "3.1")
lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.31" intransitive() ) lazy val jsch = lib("com.jcraft" % "jsch" % "0.1.31" intransitive() )
lazy val sbinary = lib("org.scala-tools.sbinary" %% "sbinary" % "0.4.0" ) lazy val sbinary = lib("org.scala-tools.sbinary" %% "sbinary" % "0.4.0" )
lazy val scalaCompiler = libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ ) lazy val scalaCompiler = libraryDependencies <+= scalaVersion("org.scala-lang" % "scala-compiler" % _ )
lazy val excludeJUnit = ivyXML := <dependencies><exclude org="junit"/></dependencies>
} }
object Licensed object Licensed
{ {