From c2406c06485c81a6444fed366cf2ae686718a616 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 24 Dec 2015 05:36:31 -0500 Subject: [PATCH] Use real local to retrieve compiler bridge during test. Fixes #36 --- .../sbt/internal/inc/BridgeProviderSpecification.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/internal/incrementalcompiler-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala b/internal/incrementalcompiler-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala index d7ef0f410..32a8406b0 100644 --- a/internal/incrementalcompiler-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala +++ b/internal/incrementalcompiler-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala @@ -9,7 +9,7 @@ import sbt.internal.inc.classpath.ClasspathUtilities import sbt.internal.librarymanagement.{ JsonUtil, ComponentManager, BaseIvySpecification } import sbt.io.IO import sbt.io.Path._ -import sbt.librarymanagement.{ ModuleID, UpdateOptions, Resolver } +import sbt.librarymanagement.{ ModuleID, UpdateOptions, Resolver, Patterns, FileRepository, DefaultMavenRepository } import sbt.util.{ Logger, Level } import xsbti.{ ComponentProvider, GlobalLock } @@ -19,7 +19,12 @@ import xsbti.{ ComponentProvider, GlobalLock } abstract class BridgeProviderSpecification extends BaseIvySpecification { log.setLevel(Level.Warn) - override def resolvers: Seq[Resolver] = super.resolvers ++ Seq(Resolver.mavenLocal, Resolver.jcenterRepo) + def realLocal: Resolver = + { + val pList = s"$${user.home}/.ivy2/local/${Resolver.localBasePattern}" :: Nil + FileRepository("local", Resolver.defaultFileConfiguration, Patterns(pList, pList, false)) + } + override def resolvers: Seq[Resolver] = Seq(realLocal, DefaultMavenRepository) private val ivyConfiguration = mkIvyConfiguration(UpdateOptions()) def getCompilerBridge(targetDir: File, log: Logger, scalaVersion: String): File = {