Move Frame and ReplClassLoader to util module

So that they can be used from the compiler module
com-lihaoyi · Jan 14, 2021 · ba548bc · ba548bc
1 parent afe90c7
commit ba548bc
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/amm/interp/src/main/scala/ammonite/interp/CompilerLifecycleManager.scala b/amm/interp/src/main/scala/ammonite/interp/CompilerLifecycleManager.scala
@@ -2,7 +2,7 @@ package ammonite.interp
 
 import ammonite.runtime._
 import ammonite.util.Util._
-import ammonite.util.{Classpath, Printer}
+import ammonite.util.{Classpath, Frame, Printer}
 
 import java.nio.file.Path
 
@@ -24,7 +24,7 @@ import scala.tools.nsc.Settings
   */
 class CompilerLifecycleManager(
   rtCacheDir: Option[Path],
-  headFrame: => ammonite.repl.api.Frame,
+  headFrame: => ammonite.util.Frame,
   dependencyCompleteOpt: => Option[String => (Int, Seq[String])],
   classPathWhitelist: Set[Seq[String]],
   initialClassLoader: ClassLoader

diff --git a/amm/interp/src/main/scala/ammonite/interp/Interpreter.scala b/amm/interp/src/main/scala/ammonite/interp/Interpreter.scala
@@ -13,7 +13,7 @@ import annotation.tailrec
 import ammonite.runtime.tools.IvyThing
 import ammonite.util.ImportTree
 import ammonite.util.Util._
-import ammonite.util._
+import ammonite.util.{Frame => _, _}
 import coursierapi.{Dependency, Fetch, Repository}
 
 /**

diff --git a/amm/repl/src/main/scala/ammonite/repl/ApiImpls.scala b/amm/repl/src/main/scala/ammonite/repl/ApiImpls.scala
@@ -5,7 +5,7 @@ import ammonite.repl.api.{Clipboard, FrontEnd, FrontEndAPI, Location, Session, S
 import ammonite.repl.tools.{Desugared, SourceRuntime}
 import ammonite.runtime._
 import ammonite.util.Util._
-import ammonite.util._
+import ammonite.util.{Frame => _, _}
 
 import java.awt.Toolkit
 import java.awt.datatransfer.{DataFlavor, StringSelection}

diff --git a/amm/runtime/src/main/scala/ammonite/runtime/ClassLoaders.scala b/amm/runtime/src/main/scala/ammonite/runtime/ClassLoaders.scala
@@ -25,7 +25,7 @@ class Frame(val classloader: SpecialClassLoader,
             val pluginClassloader: SpecialClassLoader,
             private[this] var imports0: Imports,
             private[this] var classpath0: Seq[java.net.URL],
-            private[this] var usedEarlierDefinitions0: Seq[String]) extends ammonite.repl.api.Frame{
+            private[this] var usedEarlierDefinitions0: Seq[String]) extends ammonite.util.Frame{
   private var frozen0 = false
   def frozen = frozen0
   def freeze(): Unit = {
@@ -204,7 +204,7 @@ class SpecialClassLoader(parent: ClassLoader,
                          parentSignature: Seq[(Either[String, java.net.URL], Long)],
                          var specialLocalClasses: Set[String],
                          urls: URL*)
-  extends ammonite.repl.api.ReplClassLoader(urls.toArray, parent){
+  extends ammonite.util.ReplClassLoader(urls.toArray, parent){
 
   /**
     * Files which have been compiled, stored so that our special

diff --git a/amm/runtime/src/main/scala/ammonite/runtime/Evaluator.scala b/amm/runtime/src/main/scala/ammonite/runtime/Evaluator.scala
@@ -5,7 +5,7 @@ import java.lang.reflect.InvocationTargetException
 import ammonite._
 import ammonite.interp.api.AmmoniteExit
 import util.Util.{ClassFiles, newLine}
-import ammonite.util._
+import ammonite.util.{Frame => _, _}
 
 import scala.util.Try
 

diff --git a/.../main/scala/ammonite/repl/api/Frame.scala → .../src/main/scala/ammonite/util/Frame.scala b/.../main/scala/ammonite/repl/api/Frame.scala → .../src/main/scala/ammonite/util/Frame.scala
@@ -1,4 +1,4 @@
-package ammonite.repl.api
+package ammonite.util
 
 import java.net.URL
 

diff --git a/...a/ammonite/repl/api/ReplClassLoader.scala → ...scala/ammonite/util/ReplClassLoader.scala b/...a/ammonite/repl/api/ReplClassLoader.scala → ...scala/ammonite/util/ReplClassLoader.scala
@@ -1,4 +1,4 @@
-package ammonite.repl.api
+package ammonite.util
 
 import java.net.{URL, URLClassLoader}