From 96f7e0886490d2794200d2f10fbe18ee424f3d9b Mon Sep 17 00:00:00 2001 From: jvican Date: Sat, 20 May 2017 02:37:16 +0200 Subject: [PATCH] Remove the use of `BaseIvySpecification` This is the proof that we're now testing the Zinc public API because we're resolving with the ivy options and resolution specified in the default compiler bridge provider. --- .../internal/inc/BridgeProviderSpecification.scala | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala b/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala index e655a1ef3..2d6e1748e 100644 --- a/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala +++ b/internal/zinc-ivy-integration/src/test/scala/sbt/internal/inc/BridgeProviderSpecification.scala @@ -18,11 +18,17 @@ import xsbti.{ ComponentProvider, GlobalLock } /** * Base class for test suites that must be able to fetch and compile the compiler bridge. + * + * This is a very good example on how to instantiate the compiler bridge provider. */ -abstract class BridgeProviderSpecification extends BaseIvySpecification { - override def resolvers: Vector[Resolver] = - Vector(ZincComponentCompiler.LocalResolver, DefaultMavenRepository) - private val ivyConfiguration = mkIvyConfiguration(UpdateOptions()) +abstract class BridgeProviderSpecification extends UnitSpec { + def currentBase: File = new File(".") + def currentTarget: File = currentBase / "target" / "ivyhome" + def currentManaged: File = currentBase / "target" / "lib_managed" + + val resolvers = Array(ZincComponentCompiler.LocalResolver, DefaultMavenRepository) + private val ivyConfiguration = + ZincComponentCompiler.getDefaultConfiguration(currentBase, currentTarget, resolvers, log) def secondaryCacheDirectory: File = { val target = file("target").getAbsoluteFile