Merge pull request #50 from fommil/monkeys

classpath prepending
sbt · Mar 28, 2018 · 83e50ca · 83e50ca
2 parents 36220f9 + 1ddddb0
commit 83e50ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/launcher-implementation/src/main/scala/xsbt/boot/ModuleDefinition.scala b/launcher-implementation/src/main/scala/xsbt/boot/ModuleDefinition.scala
@@ -17,9 +17,10 @@ final class RetrievedModule(val fresh: Boolean, val definition: ModuleDefinition
   def this(fresh: Boolean, definition: ModuleDefinition, detectedScalaVersion: Option[String], baseDirectories: List[File]) =
     this(fresh, definition, detectedScalaVersion, None, baseDirectories)
 
+  lazy val monkeys: Array[File] = sys.props.get("sbt.launcher.cp.prepend").toArray.flatMap(ms => ms.split(",").map(new File(_)))
   lazy val classpath: Array[File] = getJars(baseDirectories)
-  lazy val fullClasspath: Array[File] = concat(classpath, definition.extraClasspath)
+  lazy val fullClasspath: Array[File] = concat(concat(monkeys, classpath), definition.extraClasspath)
 
   def createLoader(parentLoader: ClassLoader): ClassLoader =
     new URLClassLoader(toURLs(fullClasspath), parentLoader)
-}
+}
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.16-M1
+sbt.version=0.13.17