Merge commit 'pull/42'

Conflicts: src/main/scala-sbt-0.13/spray/revolver/SbtCompatImpl.scala
spray · Sep 4, 2015 · 62466e1 · 62466e1
2 parents ade9ff9 + fb3c4f2
commit 62466e1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/scala/spray/revolver/Actions.scala b/src/main/scala/spray/revolver/Actions.scala
@@ -136,6 +136,6 @@ object Actions {
         outputStrategy = Some(config.outputStrategy getOrElse LoggedOutput(log)),
         runJVMOptions = config.runJVMOptions ++ extraJvmArgs)
 
-    Fork.scala.fork(newOptions, scalaOptions)
+    Fork.java.fork(newOptions, scalaOptions)
   }
 }
diff --git a/src/main/scala/spray/revolver/RevolverPlugin.scala b/src/main/scala/spray/revolver/RevolverPlugin.scala
@@ -73,12 +73,12 @@ object RevolverPlugin extends AutoPlugin {
       },
 
       // bundles the various parameters for forking
-      reForkOptions <<= (taskTemporaryDirectory, scalaInstance, baseDirectory in reStart, javaOptions in reStart, outputStrategy,
-        javaHome) map ( (tmp, si, base, jvmOptions, strategy, javaHomeDir) =>
+      reForkOptions <<= (taskTemporaryDirectory, baseDirectory in reStart, javaOptions in reStart, outputStrategy,
+        javaHome) map ( (tmp, base, jvmOptions, strategy, javaHomeDir) =>
         ForkOptions(
           javaHomeDir,
           strategy,
-          si.jars,
+          Nil, // bootJars is empty by default because only jars on the user's classpath should be on the boot classpath
           workingDirectory = Some(base),
           runJVMOptions = jvmOptions,
           connectInput = false