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

Use real local to retrieve compiler bridge during test. Fixes #36

This commit is contained in:
Eugene Yokota 2015-12-24 05:36:31 -05:00
parent 17f55850f6
commit c2406c0648
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/incrementalcompiler-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala
View File

@ -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 = {