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

Fix issue with scala-library.jar being retrieved

This commit is contained in:
Mark Harrah 2010-03-28 14:19:43 -04:00
parent 77567b6ad3
commit 2acea814be
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ivy/IvyConfigurations.scala
View File

@ -65,7 +65,7 @@ final class InlineConfiguration(val module: ModuleID, val dependencies: Iterable
val validate: Boolean) extends ModuleSettings
{
def withConfigurations(configurations: Iterable[Configuration]) =
new InlineConfiguration(module, dependencies, ivyXML, configurations, defaultConfiguration, None, validate)
new InlineConfiguration(module, dependencies, ivyXML, configurations, defaultConfiguration, ivyScala, validate)
def noScala = new InlineConfiguration(module, dependencies, ivyXML, configurations, defaultConfiguration, None, validate)
}
final class EmptyConfiguration(val module: ModuleID, val ivyScala: Option[IvyScala], val validate: Boolean) extends ModuleSettings

2
sbt/src/sbt-test/dependency-management/exclude-scala/project/build.properties Normal file
View File

@ -0,0 +1,2 @@
project.name=Test
project.version=1.0

15
sbt/src/sbt-test/dependency-management/exclude-scala/project/build/ExcludeScala.scala Normal file
View File

@ -0,0 +1,15 @@
import sbt._
class ExcludeScala(info: ProjectInfo) extends DefaultProject(info)
{
lazy val noScala = task { checkNoScala }
def checkNoScala =
{
val existing = compileClasspath.filter(isScalaLibrary _).get
if(existing.isEmpty) None else Some("Scala library was incorrectly retrieved: " + existing)
}
def isScalaLibrary(p: Path) = p.name contains "scala-library"
val sbinary = "org.scala-tools.sbinary" % "sbinary_2.7.7" % "0.3"
}

3
sbt/src/sbt-test/dependency-management/exclude-scala/test Normal file
View File

@ -0,0 +1,3 @@
> no-scala
> update
> no-scala