From 382b55402bb9fb27b5d27b3f098c84b92efed976 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Fri, 5 Apr 2013 09:02:24 -0400 Subject: [PATCH] don't put Scala jars on forked boot classpath by default Ideally, Scala jars on the normal classpath would be moved to the boot classpath, but this is more involved. --- main/src/main/scala/sbt/Defaults.scala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index dd26150e1..bc618a15d 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -390,9 +390,10 @@ object Defaults extends BuildCommon Seq(new Tests.Group("", tests, if(fk) Tests.SubProcess(opts) else Tests.InProcess)) } private[this] def forkOptions: Initialize[Task[ForkOptions]] = - (baseDirectory, scalaInstance, javaOptions, outputStrategy, envVars, javaHome, connectInput) map { - (base, si, options, strategy, env, javaHomeDir, connectIn) => - ForkOptions(scalaJars = si.jars, javaHome = javaHomeDir, connectInput = connectIn, outputStrategy = strategy, runJVMOptions = options, workingDirectory = Some(base), envVars = env) + (baseDirectory, javaOptions, outputStrategy, envVars, javaHome, connectInput) map { + (base, options, strategy, env, javaHomeDir, connectIn) => + // bootJars is empty by default because only jars on the user's classpath should be on the boot classpath + ForkOptions(bootJars = Nil, javaHome = javaHomeDir, connectInput = connectIn, outputStrategy = strategy, runJVMOptions = options, workingDirectory = Some(base), envVars = env) } def testExecutionTask(task: Scoped): Initialize[Task[Tests.Execution]] =