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

fix last dep-mgmt test

This commit is contained in:
Mark Harrah 2011-06-27 22:29:48 -04:00
parent fa1dd84e5b
commit 078524aa8e
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbt/src/sbt-test/dependency-management/inherit-repo/changes/WithRepository.sbt
View File

@ -1 +1 @@
resolvers += "Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/" externalResolvers := ("Extra Test Repository" at "http://dev.camptocamp.com/files/m2_repo/") :: Nil

4
sbt/src/sbt-test/dependency-management/inherit-repo/project/TestProject.scala
View File

@ -4,8 +4,12 @@
object TestProject extends Build object TestProject extends Build
{ {
override lazy val settings = super.settings :+ override lazy val settings = super.settings :+
(externalResolvers := Nil) :+
(autoScalaLibrary := false) :+
( ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy-home"))) ) ( ivyPaths <<= baseDirectory( dir => new IvyPaths(dir, Some(dir / "ivy-home"))) )
lazy val root = Project("root", file(".")) aggregate(a, b)
lazy val a = Project("a", file("a")) delegateTo(b) settings( lazy val a = Project("a", file("a")) delegateTo(b) settings(
libraryDependencies += "com.camptocamp.tl.caltar" % "core" % "0.5" intransitive() libraryDependencies += "com.camptocamp.tl.caltar" % "core" % "0.5" intransitive()
) )

3
sbt/src/sbt-test/dependency-management/inherit-repo/test
View File

@ -1,5 +1,6 @@
> set logLevel := Level.Debug
# This should fail because project A declares a dependency that exists in an extra repository, which we haven't declared # This should fail because project A declares a dependency that exists in an extra repository, which we haven't declared
-> update -> show update
# Copy the project definition with the extra repository declared in project B and with A delegating to B and reload # Copy the project definition with the extra repository declared in project B and with A delegating to B and reload
$ copy-file changes/WithRepository.sbt b/build.sbt $ copy-file changes/WithRepository.sbt b/build.sbt