From c94decd6cdb084635a4eaed35766c073d236287e Mon Sep 17 00:00:00 2001 From: dmharrah Date: Mon, 27 Jul 2009 15:33:34 +0000 Subject: [PATCH] Fixed compiler-project test git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@896 d89573ee-9141-11dd-94d4-bdf5e562f29c --- .../run-test/project/build/src/TestProject.scala | 2 +- src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala b/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala index 868aa0cff..f9ab1439c 100644 --- a/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala +++ b/src/sbt-test/compiler-project/run-test/project/build/src/TestProject.scala @@ -2,6 +2,6 @@ import sbt._ class TestProject(info: ProjectInfo) extends DefaultProject(info) { - override def useMavenConfigurations = true + override def unmanagedClasspath = super.unmanagedClasspath +++ Path.fromFile(FileUtilities.sbtJar) val sc = "org.scala-tools.testing" % "scalacheck" % "1.5" % "test->default" } diff --git a/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala b/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala index 4f0c03709..1b58be453 100644 --- a/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala +++ b/src/sbt-test/compiler-project/run-test/src/main/scala/Foo.scala @@ -6,7 +6,7 @@ import scala.tools.nsc.{Interpreter, Settings} class Foo { val settings = new Settings() - settings.classpath.value = FileUtilities.toFile(classOf[Holder].getProtectionDomain.getCodeSource.getLocation).getAbsolutePath + settings.classpath.value = sbt.FileUtilities.classLocationFile[Holder].getAbsolutePath val inter = new Interpreter(settings) def eval(code: String): Any = {