From 8ab585753b54fadc87edcc6de7c6c6156e651185 Mon Sep 17 00:00:00 2001 From: Sam Halliday Date: Fri, 9 Mar 2018 10:04:59 +0000 Subject: [PATCH 1/2] bump build sbt --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index d9654cd..133a8f1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.16-M1 +sbt.version=0.13.17 From 1ddddb0871174675fab2be543cd1300ab5c45e07 Mon Sep 17 00:00:00 2001 From: Sam Halliday Date: Fri, 9 Mar 2018 10:07:09 +0000 Subject: [PATCH 2/2] monkey patching --- .../src/main/scala/xsbt/boot/ModuleDefinition.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/launcher-implementation/src/main/scala/xsbt/boot/ModuleDefinition.scala b/launcher-implementation/src/main/scala/xsbt/boot/ModuleDefinition.scala index bf0489f..f997d36 100644 --- 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) -} \ No newline at end of file +}