From 5c85c04e0d0ccda5ddf4cb5aa33433aaadde23c3 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 12 May 2019 23:51:17 -0400 Subject: [PATCH] don't include si.allJars into the test classpath allJars contains unwanted Scala modules. Having this in prevents the flat classloader from working correctly. Ref #4609 --- main/src/main/scala/sbt/internal/ClassLoaders.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/src/main/scala/sbt/internal/ClassLoaders.scala b/main/src/main/scala/sbt/internal/ClassLoaders.scala index c486800ba..35a9b5da3 100644 --- a/main/src/main/scala/sbt/internal/ClassLoaders.scala +++ b/main/src/main/scala/sbt/internal/ClassLoaders.scala @@ -31,8 +31,8 @@ private[sbt] object ClassLoaders { private[sbt] def testTask: Def.Initialize[Task[ClassLoader]] = Def.task { val si = scalaInstance.value val rawCP = data(fullClasspath.value) - val fullCP = if (si.isManagedVersion) rawCP else si.allJars.toSeq ++ rawCP - val exclude = dependencyJars(exportedProducts).value.toSet ++ si.allJars + val fullCP = if (si.isManagedVersion) rawCP else List(si.libraryJar) ++ rawCP + val exclude = dependencyJars(exportedProducts).value.toSet ++ Set(si.libraryJar) buildLayers( strategy = classLoaderLayeringStrategy.value, si = si,