From b523594f6aa04670ed09a2f8dface5c0e83ecb53 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 14 Mar 2012 18:51:17 -0400 Subject: [PATCH] fix project/transitive-plugins test, second try --- .../transitive-plugins/project/Build.scala | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sbt/src/sbt-test/project/transitive-plugins/project/Build.scala b/sbt/src/sbt-test/project/transitive-plugins/project/Build.scala index 1b2498016..21f373fd4 100644 --- a/sbt/src/sbt-test/project/transitive-plugins/project/Build.scala +++ b/sbt/src/sbt-test/project/transitive-plugins/project/Build.scala @@ -7,10 +7,15 @@ object Build extends Build sbtBinaryVersion <<= sbtVersion ) - lazy val root = Project("root", file(".")) aggregate(a,b,c) settings( - ivyPaths in ThisBuild <<= (baseDirectory, target)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache"))) + lazy val root = Project("root", file(".")) + lazy val a = project("a") + lazy val b = project("b") + lazy val c = project("c") + def project(s: String) = Project(s, file(s)) settings( + ivyPaths <<= (baseDirectory, target in root)( (dir, t) => new IvyPaths(dir, Some(t / "ivy-cache"))), + resolvers <+= appConfiguration { app => + val ivyHome = Classpaths.bootIvyHome(app) getOrElse (file(System.getProperty("user.home")) / ".ivy2") + Resolver.file("real-local", ivyHome / "local")(Resolver.ivyStylePatterns) + } ) - lazy val a = Project("a", file("a")) - lazy val b = Project("b", file("b")) - lazy val c = Project("c", file("c")) } \ No newline at end of file