diff --git a/ivy/src/test/scala/ComponentManagerTest.scala b/ivy/src/test/scala/ComponentManagerTest.scala index ec29ae476..8ad4c0999 100644 --- a/ivy/src/test/scala/ComponentManagerTest.scala +++ b/ivy/src/test/scala/ComponentManagerTest.scala @@ -1,10 +1,8 @@ package sbt -import xsbt.{BufferedLogger, FileUtilities} - import java.io.File import org.specs._ -import FileUtilities.{createDirectory, delete, touch, withTemporaryDirectory} +import IO.{createDirectory, delete, touch, withTemporaryDirectory} import org.apache.ivy.util.ChecksumHelper import IfMissing.Fail @@ -76,7 +74,7 @@ object ComponentManagerTest extends Specification manager.define(id, files) f(files) } - private def writeRandomContent(file: File) = FileUtilities.write(file, randomString) + private def writeRandomContent(file: File) = IO.write(file, randomString) private def randomString = "asdf" private def withManager[T](f: ComponentManager => T): T = TestIvyLogger( logger => withTemporaryDirectory { temp => f(new ComponentManager(xsbt.boot.Locks, new xsbt.boot.ComponentProvider(temp), logger)) } ) diff --git a/ivy/src/test/scala/TestIvyLogger.scala b/ivy/src/test/scala/TestIvyLogger.scala index bf4386d7f..c173b43fd 100644 --- a/ivy/src/test/scala/TestIvyLogger.scala +++ b/ivy/src/test/scala/TestIvyLogger.scala @@ -1,8 +1,6 @@ package sbt -import xsbt.{BufferedLogger, ConsoleLogger, Level} - -class TestIvyLogger extends BufferedLogger(new ConsoleLogger) with IvyLogger { def verbose(msg: => String) = info(msg) } +class TestIvyLogger extends BufferedLogger(new ConsoleLogger) with IvyLogger object TestIvyLogger { def apply[T](f: IvyLogger => T): T =