diff --git a/sbt/src/sbt-test/project/external-conflict/build.sbt b/sbt/src/sbt-test/project/external-conflict/build.sbt index cd6fcb0a3..cb5b64a94 100644 --- a/sbt/src/sbt-test/project/external-conflict/build.sbt +++ b/sbt/src/sbt-test/project/external-conflict/build.sbt @@ -6,4 +6,6 @@ version := "0.1.17" publishTo <<= baseDirectory(base => Some(Resolver.file("sample", base / "repo"))) -resolvers <++= publishTo(_.toList) \ No newline at end of file +resolvers <++= publishTo(_.toList) + +ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache"))) \ No newline at end of file diff --git a/sbt/src/sbt-test/project/external-conflict/changes/Build.scala b/sbt/src/sbt-test/project/external-conflict/changes/Build.scala index 54c0a3873..1838b971a 100644 --- a/sbt/src/sbt-test/project/external-conflict/changes/Build.scala +++ b/sbt/src/sbt-test/project/external-conflict/changes/Build.scala @@ -14,10 +14,12 @@ object B extends Build def isBinary(f: File) = f / "binary" 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 binaryDep(p: Project) = p settings( libraryDependencies += "org.example" %% "app" % "0.1.17", - resolvers <+= baseDirectory(base => Resolver.file("sample", base / "repo")) + resolvers <+= baseDirectory(base => "sample" at (base / "repo").toURI.toString) ) } diff --git a/sbt/src/sbt-test/project/external-conflict/changes/ext.sbt b/sbt/src/sbt-test/project/external-conflict/changes/ext.sbt index 25391aa45..1e1823121 100644 --- a/sbt/src/sbt-test/project/external-conflict/changes/ext.sbt +++ b/sbt/src/sbt-test/project/external-conflict/changes/ext.sbt @@ -5,3 +5,5 @@ name := "app" version <<= baseDirectory { base => if(base / "older" exists) "0.1.16" else "0.1.18" } + +ivyPaths <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "../ivy-cache"))) \ No newline at end of file