remove recursive classpath implementation

1 files changed, 11 insertions, 7 deletions

diff --git a/src/partest-extras/scala/tools/partest/BytecodeTest.scala b/src/partest-extras/scala/tools/partest/BytecodeTest.scala
index 290b7b434e..bdb82605b6 100644
--- a/src/partest-extras/scala/tools/partest/BytecodeTest.scala
+++ b/src/partest-extras/scala/tools/partest/BytecodeTest.scala
@@ -1,10 +1,11 @@
 package scala.tools.partest
 
-import scala.tools.nsc.util.JavaClassPath
+import scala.tools.nsc.util.ClassFileLookup
 import scala.collection.JavaConverters._
-import scala.tools.asm.{ClassWriter, ClassReader}
+import scala.tools.asm.{ClassReader, ClassWriter}
 import scala.tools.asm.tree._
-import java.io.{File => JFile, InputStream}
+import java.io.{InputStream, File => JFile}
+
 import AsmNode._
 
 /**
@@ -125,12 +126,15 @@ abstract class BytecodeTest {
     cn
   }
 
-  protected lazy val classpath: JavaClassPath = {
-    import scala.tools.nsc.util.ClassPath.DefaultJavaContext
+  protected lazy val classpath: ClassFileLookup = {
+    import scala.tools.nsc.classpath.{FlatClassPathFactory, AggregateFlatClassPath}
     import scala.tools.util.PathResolver.Defaults
+    import scala.tools.nsc.Settings
     // logic inspired by scala.tools.util.PathResolver implementation
-    val containers = DefaultJavaContext.classesInExpandedPath(Defaults.javaUserClassPath)
-    new JavaClassPath(containers, DefaultJavaContext)
+    // `Settings` is used to check YdisableFlatCpCaching in ZipArchiveFlatClassPath
+    val factory = new FlatClassPathFactory(new Settings())
+    val containers = factory.classesInExpandedPath(Defaults.javaUserClassPath)
+    new AggregateFlatClassPath(containers)
   }
 }