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

fix project/external-conflict test to use temporary cache

This commit is contained in:
Mark Harrah 2012-03-14 18:51:17 -04:00
parent b523594f6a
commit bfd451dac1
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbt/src/sbt-test/project/external-conflict/build.sbt
View File

@ -7,3 +7,5 @@ version := "0.1.17"
publishTo <<= baseDirectory(base => Some(Resolver.file("sample", base / "repo"))) publishTo <<= baseDirectory(base => Some(Resolver.file("sample", base / "repo")))
resolvers <++= publishTo(_.toList) resolvers <++= publishTo(_.toList)
ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache")))

6
sbt/src/sbt-test/project/external-conflict/changes/Build.scala
View File

@ -14,10 +14,12 @@ object B extends Build
def isBinary(f: File) = f / "binary" exists; def isBinary(f: File) = f / "binary" exists;
def isSource(f: File) = f / "source" exists; def isSource(f: File) = f / "source" exists;
def baseProject = Project("root", file(".")) def baseProject = Project("root", file(".")) settings(
ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache")))
)
def sourceDep(p: Project) = p dependsOn( file("ext") ) def sourceDep(p: Project) = p dependsOn( file("ext") )
def binaryDep(p: Project) = p settings( def binaryDep(p: Project) = p settings(
libraryDependencies += "org.example" %% "app" % "0.1.17", libraryDependencies += "org.example" %% "app" % "0.1.17",
resolvers <+= baseDirectory(base => Resolver.file("sample", base / "repo")) resolvers <+= baseDirectory(base => "sample" at (base / "repo").toURI.toString)
) )
} }

2
sbt/src/sbt-test/project/external-conflict/changes/ext.sbt
View File

@ -5,3 +5,5 @@ name := "app"
version <<= baseDirectory { base => version <<= baseDirectory { base =>
if(base / "older" exists) "0.1.16" else "0.1.18" if(base / "older" exists) "0.1.16" else "0.1.18"
} }
ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "../ivy-cache")))